Merge branch 'dev_cyp' into dev_ar_cyp

Browse Source

# Conflicts:
#	Assets/Resources/UI/Font/HanWangZonYi.ttf.meta
#	Assets/Resources/UI/language.json
#	Assets/Scenes/Login.unity
#	Assets/Scripts/Apis/Models/MapRoute.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scripts/UIManager.cs
#	Assets/Scripts/Utils/Utils.cs

...

This commit is contained in:

lishuo committed 2022-06-02 11:30:37 +08:00

2 parents 9f0f42981e 71c9907c89

commit e513eeac5c

301 files changed

+49814 -11770

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

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

No files matched your search

Assets/Scenes/Login-Mobile.unity

+1659 -1070

File diff suppressed because it is too large. Load diff

Assets/Scenes/Login.unity

+1444 -627

File diff suppressed because it is too large. Load diff

Assets/Scenes/Test2.unity

+1229 -116

File diff suppressed because it is too large. Load diff