Merge remote-tracking branch 'origin/main' into main_ZYT
# Conflicts: # Assets/Scripts/UI/LoginPanel.cs
This commit is contained in:
@@ -109,14 +109,21 @@ public class GameManager : MonoBehaviour
|
||||
|
||||
public int curLevel = 0;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void Start()
|
||||
{
|
||||
Ins = this;
|
||||
CreatePlayer();
|
||||
LoginPanel.Show();
|
||||
|
||||
#if !UNITY_EDITOR
|
||||
PXR_Enterprise.InitEnterpriseService();
|
||||
PXR_Enterprise.BindEnterpriseService();
|
||||
TrueGearEffectManager.Ins.StartRequestTrueGear();
|
||||
#endif
|
||||
CoroutineTaskManager.Instance.WaitSecondTodo(ShowPlayerUI, 1.5f);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user