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

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

@@ -273,14 +273,26 @@ namespace GFGGame
             int errorCode = await LoginHelper.EnterGame(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)
             {
-                if (errorCode != ErrorCode.ERR_SessionStateError && errorCode != ErrorCode.ERR_NetWorkError)
+                string errMessage = "与服务器连接失败。";
+                Log.Error($"Reconnect fail, errorCode {errorCode}!");
+                if(errorCode == ErrorCode.ERR_TokenError)
                 {
-                    Log.Error($"Reconnect fail, errorCode {errorCode}!");
+                    errMessage = "登录已过期，请重新登录";
+                    AlertSystem.Show(errMessage)
+                            .SetRightButton(true, "好的", (object data) =>
+                            {
+                                GameController.QuitToLoginView(false);
+                            });
+                    return;
                 }
-                AlertSystem.Show("重新连接失败，游戏或已更新，请重新进入游戏获得最佳体验。")
-                        .SetRightButton(true, "好的", (object data) =>
+                else if(errorCode == ErrorCode.ERR_NetWorkError)
+                {
+                    errMessage = "网络异常，与服务器连接失败。";
+                }
+                AlertSystem.Show(errMessage)
+                        .SetRightButton(true, "重新连接", (object data) =>
                         {
-                            Application.Quit();
+                            ReqReConnectGate().Coroutine();
                         });
                 return;
             }

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/DisConnected/DisConnectedCompnentSystem.cs

@@ -19,7 +19,7 @@ namespace ET
 
                     if (!Application.isFocused)
                     {
-                        AlertSystem.Show("连接已断开。")
+                        AlertSystem.Show("与服务器连接已断开。")
                         .SetRightButton(true, "重新连接", (object data) =>
                         {
                             LoginController.ReqReConnectGate().Coroutine();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -23,6 +23,7 @@ namespace UI.LuckyBox
         public GTextField m_txtCount;
         public GTextField m_txtHasTime;
         public GGroup m_grpActivityTips;
+        public GLoader m_ImgUp;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -86,6 +87,7 @@ namespace UI.LuckyBox
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtHasTime = (GTextField)comp.GetChild("txtHasTime");
             m_grpActivityTips = (GGroup)comp.GetChild("grpActivityTips");
+            m_ImgUp = (GLoader)comp.GetChild("ImgUp");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -108,6 +110,7 @@ namespace UI.LuckyBox
             m_txtCount = null;
             m_txtHasTime = null;
             m_grpActivityTips = null;
+            m_ImgUp = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertSystem.cs

@@ -44,6 +44,18 @@ namespace GFGGame
         {
             _alertWindow = null;
         }
+
+        public static bool IsShow
+        {
+            get
+            {
+                if (_alertWindow == null)
+                {
+                    return false;
+                }
+                return _alertWindow.isShowing;
+            }
+        }
     }
 
 }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -122,7 +122,7 @@ namespace GFGGame
                 LuckyBoxDataManager.Instance.luckyBoxIds.Insert(0, _activeBoxId);
             }
 
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[1];  //默认跳转进来是第二个活动
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];  //默认跳转进来是第一个活动
             if (this.viewData != null)
             {
                 int index = (int)this.viewData;  //传入的值为第几个活动，不是活动id
@@ -174,6 +174,7 @@ namespace GFGGame
             else
                 _listActivityBtnObj[boxId] = obj;
 
+            comBox.m_ImgUp.visible = index == 0;
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             if (activityId > 0 && boxId == LuckyBoxDataManager.BOX_ID_2)
             {

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -963,14 +963,14 @@ namespace GFGGame
 
         private void CheckProbabilityUp()
         {
-            long curTime = TimeHelper.ServerNow();
-            long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
+            //long curTime = TimeHelper.ServerNow();
+            //long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
             //int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             //if (activityId > 0)
-            if (endTime >= curTime)
-                _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 1;
-            else
-                _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 0;
+            //if (endTime >= curTime)
+            //    _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 1;
+            //else
+            //    _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 0;
         }
 
         private void CheckGuide(object param)