lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
This commit is contained in:
lishuo committed 2021-04-25 19:43:07 +08:00
2 parents 02b8f97d83 8de7e94c8d
commit 2b275d6dc5
12 files changed
+1058 -465
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/LoginController.cs
+2 -2
View File
@@ -1009,9 +1009,9 @@ public class LoginController : MonoBehaviour
{
loginForm.password.ActivateInputField();
}
if (Input.GetKey(KeyCode.KeypadEnter) || Input.GetKey(KeyCode.Return))
if (Input.GetKeyDown(KeyCode.KeypadEnter) || Input.GetKeyDown(KeyCode.Return))
{
if (loginForm != null && !string.IsNullOrEmpty(loginForm.email.text) && !string.IsNullOrEmpty(loginForm.password.text))
if (loginForm != null && !string.IsNullOrEmpty(loginForm.email.text) && !string.IsNullOrEmpty(loginForm.password.text))
{
Submit();
}