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
This commit is contained in:
lishuo committed 2022-01-13 17:13:08 +08:00
2 parents d33e130eca 0a1ba5fbde
commit 8a2d4f7b85
4 files changed
+1117 -1117
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/Login-Mobile.unity
+1111 -1111
View File
File diff suppressed because it is too large. Load diff
Assets/Scripts/UIManager.cs
+1 -1
View File
@@ -605,7 +605,7 @@ public class UIManager : MonoBehaviour
{
return;
}
if (parent == UIManager.Instance.MainPanel)
if (UIManager.Instance.MainPanel != null && parent == UIManager.Instance.MainPanel)
{
App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.HomePanel);
}