Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble

# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
This commit is contained in:
lishuo committed 2021-09-13 18:28:05 +08:00
commit 939d6f1d0c
20 files changed
+1636 -1518

No files matched your search

@@ -433,6 +433,7 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
public void OnMobileImageSelect(string res)
{
Debug.Log(res);
if (res.IndexOf("true,") == 0)
{
var path = res.Replace("true,", "");