Merge branch 'dev_release' into feature_AR

# Conflicts:
#	Assets/Resources/UI/language.json
This commit is contained in:
lishuo committed 2022-07-22 17:35:35 +08:00
commit 4d5bc8f080
4 files changed
+18 -17

No files matched your search

@@ -2469,7 +2469,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mType: 3
Tooltips: CHANGE ACCOUNT
Tooltips: DELETE ACCOUNT
--- !u!1 &5404217437987161135
GameObject:
m_ObjectHideFlags: 0
+2
View File
@@ -378,6 +378,7 @@
"Are you sure you want to delete the account?": "是否确认注销账号?",
"Delete Your Route": "删除您的线路",
"Are you sure you want to delete this route?": "你确定要删除这条线路吗?",
"DELETE ACCOUNT": "注销账号",
"BATTLE": "对战"
},
"en": {
@@ -752,6 +753,7 @@
"Are you sure you want to delete the account?": "Are you sure you want to delete the account?",
"Delete Your Route": "Delete Your Route",
"Are you sure you want to delete this route?": "Are you sure you want to delete this route?",
"DELETE ACCOUNT": "DELETE ACCOUNT",
"BATTLE": "BATTLE"
}
}