Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -212,11 +212,8 @@ namespace GFGGame
             {
                 return name;
             }
-            else
-            {
-                ErrorCodeController.Handler(result);
-                return "";
-            }
+            ErrorCodeController.Handler(result);
+            return "";
         }
 
         public static async ETTask ReqCreateRole(string roleName = null)

GameClient/Assets/Game/HotUpdate/ServerProxy/BattlePassTaskSProxy.cs

@@ -135,6 +135,7 @@ namespace GFGGame
                     dataManager.AddSuperReward(level);
                 }
             }
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             BonusController.TryShowBonusList(bonusList, onSuccess);
             return true;
         }

GameClient/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs

@@ -34,14 +34,14 @@ namespace GFGGame
             _ui.m_btnSure.onClick.Add(OnClickBtnSure);
             _ui.m_btnDice.onClick.Add(() =>
             {
-                RandomRoleName();
+                RandomRoleName().Coroutine();
             });
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            RandomRoleName();
+            RandomRoleName().Coroutine();
             LogServerHelper.SendNodeLog((int)LogNode.ShowCreateRole);
         }
 
@@ -78,10 +78,13 @@ namespace GFGGame
             }
         }
 
-        private async void RandomRoleName()
+        private async ETTask RandomRoleName()
         {
             string name = await LoginController.ReqRandomRoleName();
-            _ui.m_inputName.text = name;
+            if(_ui != null && _ui.m_inputName != null)
+            {
+                _ui.m_inputName.text = name;
+            }
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using ET;
 using FairyGUI;
 using UI.Task;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -64,6 +65,7 @@ namespace GFGGame
                  let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.level)
                  where battlePassCfg.level != 0 && state != 2
                  select battlePassCfg.level).FirstOrDefault();
+            minLevel = Mathf.Max(1, minLevel);
             _ui.m_RewardList.ScrollToView(minLevel - 1);
         }
 
@@ -107,6 +109,15 @@ namespace GFGGame
 
         private void OnBtnBuyLevel(EventContext context)
         {
+            var dataManager = BattlePassTaskDataManager.Instance;
+            var seasonId = dataManager.GetSeasonId();
+            var battlePassCfg =
+                BattlePassCfgArray.Instance.GetCfgByidAndlevel(seasonId, dataManager.GetBattlePassLevel() + 1);
+            if(battlePassCfg == null)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("已经满级");
+                return;
+            }
             ViewManager.Show<BuyBattlePassLevelView>(null, new object[] { typeof(BattlePassTaskView).FullName, null });
         }