Просмотр исходного кода

优化主界面启动流程,缩短时间

guodong 1 год назад
Родитель
Сommit
540c06088c

+ 5 - 2
GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -184,8 +184,11 @@ namespace GFGGame
         //通知阿福赠礼活动状态的更新
         public const string AFU_GIFT_CHANGED = "AFU_GIFT_CHANGED";
 
-        //通知七日签到数据更新
-        public const string SEVENDAY_LOGIN = "SEVENDAYLOGIN";
+        //七日签到界面关闭
+        public const string SEVEN_DAY_LOGIN_VIEW_CLOSED = "SEVEN_DAY_LOGIN_VIEW_CLOSED";
+
+        //第二部分游戏数据获取数据完毕
+        public const string AFTER_DATA_INITED = "AFTER_DATA_INITED";
 
         //通知新限时累充领取成功
         public const string NEWLIMITCHARGE_GET = "NEWLIMITCHARGEGET";

+ 33 - 16
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -36,13 +36,18 @@ namespace GFGGame
         {
             var url = LauncherConfig.cfgUrl.Replace("{cfgName}", GameGlobal.cfgName);
             url = url + "?t=" + TimeHelper.ClientNow();
+            LauncherView.Instance.SetDesc("正在解压数据...");
             HttpTool.Instance.Get(url, (string data) =>
             {
                 //初始化游戏配置
                 GameConfig.InitData(data);
+                //缓存一部分配置文件
+                FightScoreCfgArray.Instance.Init();
+                StudioCfgArray.Instance.Init();
+                DailySignCfgArray.Instance.Init();
+                DailyLoginCfgArray.Instance.Init();
                 //显示登录
                 LoginController.ShowLogin();
-                //ItemCfgArray.Instance.Init();
             });
         }
 
@@ -174,8 +179,29 @@ namespace GFGGame
             });
         }
 
-        public static async void AfterEnterGame(object param = null)
+        public static async void AfterShowMainUI(object param = null)
         {
+            if (GameGlobal.AfterDataInited) return;
+
+            await ActivitySProxy.ReqSevenDayLoginInfos();
+
+            await ActivityGlobalSProxy.GetActivityInfo();
+
+            FieldDataManager.Instance.waitToShowFieldFightEndView = false;
+            bool result = await FieldSProxy.ReqFieldInstanceInfos();
+            if (result && FieldDataManager.Instance.fieldInfos.hasBonus)
+            {
+                bool result1 = await FieldSProxy.ReqFieldInstanceResult();
+                if (result1)
+                {
+                    FieldDataManager.Instance.waitToShowFieldFightEndView = true;
+                }
+            }
+            GameGlobal.AfterDataInited = true;
+            EventAgent.DispatchEvent(ConstMessage.AFTER_DATA_INITED);
+
+
+
             ItemProxy.GetItemAttributeInfos().Coroutine();
             MainStorySProxy.GetStoryBonusInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
@@ -199,10 +225,8 @@ namespace GFGGame
             LuckyBoxSProxy.ReqGetLuckyBoxInfo().Coroutine();
             LeagueSproxy.ReqGetLeagueInfo().Coroutine();
             SuitFosterProxy.SendGetSuitInfos().Coroutine();
-            ActivitySProxy.ReqSevenDayLoginInfos().Coroutine();
             ShopSProxy.ReqShopInfo().Coroutine();
             StudioSProxy.ReqStudioInfos().Coroutine();
-            ActivityGlobalSProxy.GetActivityInfo().Coroutine();
             LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo().Coroutine();
             LeagueSproxy.GetTeapartyInfos().Coroutine();
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
@@ -219,22 +243,15 @@ namespace GFGGame
             StudioDataManager.Instance.filingChapterId = StudioDataManager.Instance.npcFilingChapterId;
             GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;
 
-            bool result = await FieldSProxy.ReqFieldInstanceInfos();
-            if (result && FieldDataManager.Instance.fieldInfos.hasBonus)
-            {
-                bool result1 = await FieldSProxy.ReqFieldInstanceResult();
-                if (result1)
-                {
-                    ViewManager.Show<FieldFightEndView>();
-                }
-            }
-
-            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
         }
 
         public static void QuitToLoginView(bool logout)
         {
-            GameGlobal.DataInited = false;
+            FieldDataManager.Instance.waitToShowFieldFightEndView = false;
+            GameGlobal.AutoSevenDayLoginView = true;
+            GameGlobal.AutoDailySignView = true;
+            GameGlobal.PreDataInited = false;
+            GameGlobal.AfterDataInited = false;
             QDManager.OnQuitToLoginView();
             GameGlobal.isVisitor = false;
             GameGlobal.antiAddiction = true;

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -65,7 +65,7 @@ namespace GFGGame
         private static GList targetList = null;
         public static bool TryGuide(GComponent target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false, bool noTips = false)
         {
-            if (!GameGlobal.DataInited)
+            if (!GameGlobal.PreDataInited)
             {
                 return false;
             }

+ 13 - 5
GameClient/Assets/Game/HotUpdate/Data/BattlePassTaskDataManager.cs

@@ -26,7 +26,7 @@ namespace GFGGame
         private HashSet<int> SuperRewards = new HashSet<int>();
 
         //所有特别奖励
-        private List<KeyValuePair<int, int>> tempItems = new List<KeyValuePair<int, int>>();
+        private List<KeyValuePair<int, int>> tempItems;
 
         public int GetSeasonId()
         {
@@ -51,8 +51,6 @@ namespace GFGGame
             var seasonCfg = BattlePassOpenCfgArray.Instance.GetCfg(seasonId);
             if (seasonCfg == null) return;
             SeasonEndTime = TimeUtil.GetResetTimeSec(seasonCfg.endTime);
-            SetSpecialCfgCache();
-            InitItemTemp();
         }
 
         public void SetIsBuy(bool isBuy)
@@ -107,6 +105,11 @@ namespace GFGGame
 
         public BattlePassCfg GetSpecialCfg(int level)
         {
+            //在需要时再初始化数据
+            if(selectionCache == null)
+            {
+                SetSpecialCfgCache();
+            }
             var targetLevel = selectionCache.GetValueNoCache(level);
             return BattlePassCfgArray.Instance.GetCfgByidAndlevel(SeasonId, targetLevel);
         }
@@ -129,12 +132,17 @@ namespace GFGGame
         //获取所有特别奖励
         public List<KeyValuePair<int, int>> GetAllSpecialCfg()
         {
+            //在需要时再初始化数据
+            if (tempItems == null)
+            {
+                InitItemTemp();
+            }
             return tempItems;
         }
 
         private void InitItemTemp()
         {
-            tempItems.Clear();
+            tempItems = new List<KeyValuePair<int, int>>();
             var battlePassCfgs = BattlePassCfgArray.Instance.GetCfgsByid(GetSeasonId());
             var items = new Dictionary<int, int>();
             foreach (var itemsInfo in battlePassCfgs.SelectMany(battlePassCfg => battlePassCfg.bonusSpecialArr))
@@ -190,7 +198,7 @@ namespace GFGGame
             selectionCache = null;
             NormalRewards.Clear();
             SuperRewards.Clear();
-            tempItems.Clear();
+            tempItems = null;
             initedFromServer = false;
         }
 

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Data/CardDataManager.cs

@@ -38,8 +38,8 @@ namespace GFGGame
             cardData.lv = cardInfoProto.Lvl;
             cardData.exp = cardInfoProto.Exp;
             cardData.star = cardInfoProto.Star;
-            cardData.mainScore = cardData.itemCfg.mainScore;
-            cardData.resIndex = cardInfoProto.ResIndex >= cardData.resources.Count ? 0 : cardInfoProto.ResIndex;
+            cardData.mainScore = cardInfoProto.MainScore;
+            cardData.resIndex = cardInfoProto.ResIndex;
             for (int i = 0; i < cardInfoProto.KsStarBonus.Count; i++)
             {
                 cardData.starRewardsState[cardInfoProto.KsStarBonus[i]] = cardInfoProto.VsStarBonus[i];

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/DressUpMenuItemDataManager.cs

@@ -70,7 +70,7 @@ namespace GFGGame
                 }
                 _itemDatasByRarityDic[itemInfoProto.Rarity].Add(value);
 
-                if (GameGlobal.DataInited)
+                if (GameGlobal.PreDataInited)
                 {
                     AddNewDressItem(value);
                     DressUpMenuSuitDataManager.CheckItemInSuit(value);

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Data/FieldDataManager.cs

@@ -55,6 +55,8 @@ namespace GFGGame
 
         public FieldInfos fieldInfos = new FieldInfos();
         public FieldResult fieldResult = new FieldResult();
+        //用于记录进入主界面后打开界面
+        public bool waitToShowFieldFightEndView = false;
 
 
         /// <summary>

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -41,7 +41,7 @@ namespace GFGGame
                 DressUpMenuItemDataManager.Add(itemInfoProto);
 
                 //游戏角色初始数据完成后才执行
-                if (GameGlobal.DataInited)
+                if (GameGlobal.PreDataInited)
                 {
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
                     FunctionOpenCfg functionOpenCfg = FunctionOpenCfgArray.Instance.GetCfg(typeof(ClothingListView).Name);
@@ -62,14 +62,14 @@ namespace GFGGame
             if (itemInfoProto.Type == ConstItemType.HEAD)
             {
                 RoleInfoManager.Instance.Add(itemInfoProto);
-                if (GameGlobal.DataInited)
+                if (GameGlobal.PreDataInited)
                 {
                     RoleInfoManager.Instance.AddNew(itemID);
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                 }
             }
             PhotographDataManager.Instance.Add(itemInfoProto);
-            if(GameGlobal.DataInited)
+            if(GameGlobal.PreDataInited)
             {
                 EventAgent.DispatchEvent(ConstMessage.ITEM_CHANGED, itemID);
             }

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Data/VO/CardData.cs

@@ -11,7 +11,8 @@ namespace GFGGame
         public int lv;
         public int exp;
         public int star;
-        public int resIndex;//当前卡面,0默认,1特殊
+        public int _resIndex = -1;//当前卡面,0默认,1特殊
+        public int resIndex;
         public int mainScore;
         public List<string> _resources;//所有配置卡面
         public List<string> resources

+ 6 - 2
GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -26,10 +26,14 @@ namespace GFGGame
         /// <summary>
         /// 初始数据是否已处理
         /// </summary>
-        public static bool DataInited;
+        public static bool PreDataInited;
+        //其他数据已处理
+        public static bool AfterDataInited;
+
         public static NumericComponent myNumericComponent;
         public static int lastLoginTime;//上次登录时间
-        public static bool isLogon;//是否是重新登录
+        public static bool AutoSevenDayLoginView = true;
+        public static bool AutoDailySignView = true;
 
 
 

+ 1 - 15
GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -37,8 +37,6 @@ namespace GFGGame
                 {
                     ActivityDataManager.Instance.sevenDayLoginLoginIdList = response.KsBonusId;
                     ActivityDataManager.Instance.sevenDayLoginBonusStatusList = response.VsBonusStatus;
-
-                    EventAgent.DispatchEvent(ConstMessage.SEVENDAY_LOGIN);
                     return true;
                 }
             }
@@ -55,19 +53,7 @@ namespace GFGGame
                     ActivityDataManager.Instance.sevenDayLoginBonusStatusList[response.BonusId - 1] = response.BonusStatus;
                     int[][] rewards = DailyLoginCfgArray.Instance.GetCfg(response.BonusId).rewardsArr;
 
-                    BonusController.TryShowBonusList(rewards, onSuccess: () =>
-                    {
-                        //签到完成后,关闭获得物品页面后,自动每日签到,窗口让玩家手动关闭
-                        bool isGot = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay),
-                            TimeUtil.GetCurDay());
-                        if (!isGot)
-                        {
-                            if (RedDotDataManager.Instance.DailySignRed())
-                            {
-                                ViewManager.Show<DailySignView>(new object[] { 1 });
-                            }  
-                        }
-                    });
+                    BonusController.TryShowBonusList(rewards);
 
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;

+ 3 - 2
GameClient/Assets/Game/HotUpdate/ServerProxy/ItemProxy.cs

@@ -8,7 +8,8 @@ namespace GFGGame
     {
         public static async ETTask<bool> GetItemInfos()
         {
-            GameGlobal.DataInited = false;
+            GameGlobal.PreDataInited = false;
+            GameGlobal.AfterDataInited = false;
             M2C_GetItemInfos response = null;
             response = (M2C_GetItemInfos)await MessageHelper.SendToServer(new C2M_GetItemInfos());
             if (response != null)
@@ -48,7 +49,7 @@ namespace GFGGame
 
                     }
                     //!!!必须放在最后,标记数据初始化完成
-                    GameGlobal.DataInited = true;
+                    GameGlobal.PreDataInited = true;
                     return true;
                 }
             }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/GetSuitItemController.cs

@@ -14,7 +14,7 @@ namespace GFGGame
 
         public static void AddItemId(int itemId)
         {
-            if (!enable || !GameGlobal.DataInited)
+            if (!enable || !GameGlobal.PreDataInited)
             {
                 return;
             }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -105,6 +105,7 @@ namespace GFGGame
                     }
                 );
             }
+            GameGlobal.AutoDailySignView = false;
         }
 
         protected override void OnHide()
@@ -112,7 +113,6 @@ namespace GFGGame
             base.OnHide();
             _ui.m_t0.Stop();
             m_holderSign = null;
-            GameGlobal.isLogon = false;
         }
 
         protected override void RemoveEventListener()

+ 2 - 6
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/SevenDayLoginView.cs

@@ -50,6 +50,7 @@ namespace GFGGame
             UpdateView();
             _ui.m_comIcon.m_loaIcon.url = "ui://DailyWelfare/yzhd_dyt_5";
             _ui.m_comIcon.m_loaIcon.data = _cfg;
+            GameGlobal.AutoSevenDayLoginView = false;
         }
         private void UpdateView()
         {
@@ -60,13 +61,9 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            if (GameGlobal.isLogon && RedDotDataManager.Instance.DailySignRed())
-            {
-                ViewManager.Show<DailySignView>(new object[] { 1 });
-            }
             _ui.m_list.numItems = 0;
             ViewManager.SetMaskAlpha(0.6f);
-            GameGlobal.isLogon = false;
+            EventAgent.DispatchEvent(ConstMessage.SEVEN_DAY_LOGIN_VIEW_CLOSED);
         }
         private void ListItemRender(int index, GObject obj)
         {
@@ -100,7 +97,6 @@ namespace GFGGame
                 {
                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 2);
                     UpdateView();
-                    GameGlobal.isLogon = false;
                 }
             }
             else

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Field/FieldFightEndView.cs

@@ -40,6 +40,7 @@ namespace GFGGame
             FieldDataManager.Instance.currFightLv = 1;
 
             UpdateView();
+            FieldDataManager.Instance.waitToShowFieldFightEndView = false;
         }
         private void UpdateView()
         {

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -53,7 +53,6 @@ namespace GFGGame
             _ui.m_loaEventb.onClick.Add(() => { FullScreenTextController.Show("event:b"); });
             _ui.m_loaEventc.onClick.Add(() => { FullScreenTextController.Show("event:c"); });
             //_ui.m_btnAgree.onClick.Add(OnBtnAgreeCklick);
-            GameGlobal.isLogon = true;
         }
         protected override void AddEventListener()
         {
@@ -101,7 +100,6 @@ namespace GFGGame
                 QDManager.InitPlatform();
             }
 
-            GameGlobal.isLogon = true;
         }
 
         protected override void OnHide()

+ 47 - 39
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -146,7 +146,8 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.AddEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
             EventAgent.AddEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
-            EventAgent.AddEventListener(ConstMessage.SEVENDAY_LOGIN, SevenDayLoginShow);
+            EventAgent.AddEventListener(ConstMessage.SEVEN_DAY_LOGIN_VIEW_CLOSED, CheckAutoShowViews);
+            EventAgent.AddEventListener(ConstMessage.AFTER_DATA_INITED, OnFaterDataInited);
         }
 
         protected override void RemoveEventListener()
@@ -157,7 +158,8 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, OnRedDotChanged);
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.RemoveEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
-            EventAgent.RemoveEventListener(ConstMessage.SEVENDAY_LOGIN, SevenDayLoginShow);
+            EventAgent.RemoveEventListener(ConstMessage.SEVEN_DAY_LOGIN_VIEW_CLOSED, CheckAutoShowViews);
+            EventAgent.RemoveEventListener(ConstMessage.AFTER_DATA_INITED, OnFaterDataInited);
         }
 
         protected override void OnShown()
@@ -180,6 +182,7 @@ namespace GFGGame
             _valueBarController.OnShown();
 
             CheckFunOpen();
+            UpdateBtnFirstRecharge();
 
             Timers.inst.Remove(Update);
             //Timers.inst.Remove(CheckGuide);
@@ -188,9 +191,7 @@ namespace GFGGame
             Update(null);
 
             Timers.inst.Remove(OnShowLater);
-            Timers.inst.Add(1f, 1, OnShowLater);
-
-            //UpdateRedDot();
+            Timers.inst.Add(0.1f, 1, OnShowLater);
 
             // 刚进游戏不播放主界面入场动画
             if (firstIn)
@@ -222,27 +223,17 @@ namespace GFGGame
 
         private void OnShowLater(object param)
         {
-            GameController.AfterEnterGame();
-            UpdateBtnFirstRecharge();
             CheckProbabilityUp();
-            CheckDailySign();
-            GetAdIds();
+            if(!GameGlobal.AfterDataInited)
+            {
+                GameController.AfterShowMainUI();
+            }
         }
 
-        private void CheckDailySign()
+        private void OnFaterDataInited()
         {
-            if (GameGlobal.isLogon)
-            {
-                if (ActivityDataManager.Instance.CanGetSevenDayBonus() &&
-                    GuideDataManager.currentGuideId <= 0)
-                {
-                    ViewManager.Show<SevenDayLoginView>();
-                }
-                else if (RedDotDataManager.Instance.DailySignRed())
-                {
-                    ViewManager.Show<DailySignView>(new object[] { 1 });
-                }
-            }
+            GetAdIds();
+            CheckAutoShowViews();
         }
 
         private void AddEffect()
@@ -588,6 +579,19 @@ namespace GFGGame
         {
             ShowExitAlert();
 
+            UpdateActLuckyBox();
+
+            UpdateLimitedActvityState();
+            UpdateTime();
+
+            //特惠礼包/限时礼包窗口内的倒计时
+            UpGiftBox1();
+            UpGiftBox2();
+            EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_TIME);
+        }
+
+        private void UpdateActLuckyBox()
+        {
             int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
             _ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
             if (actLuckyBoxId > 0)
@@ -603,7 +607,10 @@ namespace GFGGame
                 long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
                 _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
+        }
 
+        private void UpdateLimitedActvityState()
+        {
             int actLimitTsyId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             if (actLimitTsyId > 0)
             {
@@ -627,17 +634,6 @@ namespace GFGGame
                 ActivityDataManager.Instance.AllSevenDayBonusGot()));
             }
 
-            UpdateLimitedActvityState();
-            UpdateTime();
-
-            //特惠礼包/限时礼包窗口内的倒计时
-            UpGiftBox1();
-            UpGiftBox2();
-            EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_TIME);
-        }
-
-        private void UpdateLimitedActvityState()
-        {
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
         }
@@ -851,6 +847,7 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             return;
+            if (firstIn) return;
             LogHelper.LogEditor("MainUIView UpdateRedDot");
             _valueBarController.UpRead();
             RedDotController.Instance.SetComRedDot(_btnGongGao, RedDotDataManager.Instance.GetNoticeRed(), "", -9, 12);
@@ -995,25 +992,36 @@ namespace GFGGame
             UpdateRedDot();
             UpdateHead();
             UpdateBtnFirstRecharge();
+            CheckAutoShowViews();
         }
-        private void SevenDayLoginShow()
+        private void CheckAutoShowViews()
         {
             //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
-            if (GameGlobal.isLogon)
+            if (GameGlobal.AutoSevenDayLoginView)
             {
                 if (ActivityDataManager.Instance.CanGetSevenDayBonus() &&
                     GuideDataManager.currentGuideId <= 0)
                 {
                     ViewManager.Show<SevenDayLoginView>();
-
+                    return;
                 }
-                else if (RedDotDataManager.Instance.DailySignRed())
+
+                //GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
+            }
+            if (GameGlobal.AutoDailySignView)
+            {
+                if (RedDotDataManager.Instance.DailySignRed())
                 {
                     ViewManager.Show<DailySignView>(new object[] { 1 });
+                    return;
                 }
-
-                //GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
+            }
+            if (FieldDataManager.Instance.waitToShowFieldFightEndView)
+            {
+                ViewManager.Show<FieldFightEndView>();
+                return;
             }
         }
+
     }
 }

+ 2 - 2
GameClient/Assets/Game/Launcher/LauncherController.cs

@@ -12,7 +12,7 @@ namespace GFGGame
         /// </summary>
         public static void InitLauncherCfg()
         {
-            LauncherView.Instance.SetDesc("正在初始化...");
+            LauncherView.Instance.SetDesc("正在检查更新...");
             var url = LauncherConfig.cfgUrl.Replace("{cfgName}", LauncherConfig.cfgName);
             url = url + "?t=" + DateTime.Now.Ticks;
             HttpTool.Instance.Get(url, (string json) =>
@@ -97,7 +97,7 @@ namespace GFGGame
 
         private static void StartGame()
         {
-            LauncherView.Instance.SetDesc($"稍等片刻,精彩马上呈现...");
+            LauncherView.Instance.SetDesc($"正在初始化...");
             HotUpdateCodeLoader.Instance.StartLoad();
         }