Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate

Assets/Scripts/CECHostPlayer.cs

@@ -324,7 +324,7 @@ namespace BrewMonster
 
             CreateInventories();
             // run a process on background to keep track of task status.
-            UniTask.RunOnThreadPool(TickTask, false, this.GetCancellationTokenOnDestroy()).Forget();
+            TickTask().Forget();
         }
 
         public bool LoadResources()

Assets/Scripts/CECUIManager.cs

@@ -462,13 +462,14 @@ public class CECUIManager : MonoSingleton<CECUIManager>
     }
 
     /// <summary>Shows the player options menu for the given character. Requires a prefab with id "DlgPlayerOptions" in DialogScriptTableObject.</summary>
-    public void ShowPlayerOptionsDialog(int characterId)
+    public void ShowPlayerOptionsDialog(int characterId, Vector2 position)
     {
         if (characterId == 0 || canvasDlg == null) return;
         var gui = GetInGameUIMan();
         if (_dlgPlayerOptions == null)
             _dlgPlayerOptions = gui.GetDialog("DlgPlayerOptions");
         _dlgPlayerOptions?.ShowForPlayer(characterId);
+        _dlgPlayerOptions.transform.position = position;
     }
 
     /// <summary>
@@ -532,7 +533,9 @@ public class CECUIManager : MonoSingleton<CECUIManager>
         CECHostPlayer hostPlayer = EC_Game.GetGameRun()?.GetHostPlayer();
         if (hostPlayer != null)
         {
+#if UNITY_EDITOR
             hostPlayer.CycleSkillShortcuts();
+#endif
         }
     }