Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs
This commit is contained in:
Caiyanpeng committed 2021-12-28 11:26:34 +08:00
commit f23fc4b4c0
45 files changed
+4765 -1412

No files matched your search

+1 -1
View File
@@ -164,7 +164,7 @@
"Route Name": "线路名称",
"SETTING": "设置",
"NOTIFICATION": "通知",
"GO!": "进入!",
"GO!": "开始!",
"Go": "进入",
"Stay": "忽略",
"ALL RACE": "所有赛事",