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

GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs

@@ -329,9 +329,12 @@ namespace GFGGame
         //茶话会雅集奖励是否可以领取
         public int CheckTeaPartyLeagueRewardStatu(int targetScore)
         {
-            var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
             var teapartyRewardLeagueCfgs = TeapartyRewardLeagueCfgArray.Instance.GetCfgsByid(LeagueDataManager.Instance.TeaPartyId);
-
+            if (teapartyRewardLeagueCfgs == null)
+                return 0;
+            var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
+            if (roleTeapartyInfo == null || roleTeapartyInfo.LeagueAwardStatusVs == null || roleTeapartyInfo.LeagueAwardStatusVs.Count <= 0)
+                return 0;
             for (int i = 0; i < teapartyRewardLeagueCfgs.Count; i++)
             {
                 if (teapartyRewardLeagueCfgs[i].targetScore == targetScore)

GameClient/Assets/Game/HotUpdate/Views/League/LeagueConstructView.cs

@@ -176,22 +176,20 @@ namespace GFGGame
             _ui.m_comHotel0.m_txtNextAdd.text = memberLimitAdd.ToString();
             _ui.m_comHotel0.m_c1.selectedIndex = memberLimitAdd > 0 ? 1 : 0;
 
-            int memberDayLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAdd - hotelCfg.limitDayAdd;
-            _ui.m_comHotel1.m_txtCurValue.text = hotelCfg.limitDayAdd.ToString();
-            _ui.m_comHotel1.m_txtNextAdd.text = memberDayLimitAdd.ToString();
-            _ui.m_comHotel1.m_c1.selectedIndex = memberDayLimitAdd > 0 ? 1 : 0;
-
-            int memberDayExtraLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAddExtra - hotelCfg.limitDayAddExtra;
-            _ui.m_comHotel2.m_txtCurValue.text = hotelCfg.limitDayAddExtra.ToString();
-            _ui.m_comHotel2.m_txtNextAdd.text = memberDayExtraLimitAdd.ToString();
-            _ui.m_comHotel2.m_c1.selectedIndex = memberDayExtraLimitAdd > 0 ? 1 : 0;
-
             int flowerLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitPosition - hotelCfg.limitPosition;
-            _ui.m_comHotel3.m_txtCurValue.text = hotelCfg.limitPosition.ToString();
-            _ui.m_comHotel3.m_txtNextAdd.text = flowerLimitAdd.ToString();
-            _ui.m_comHotel3.m_c1.selectedIndex = flowerLimitAdd > 0 ? 1 : 0;
+            _ui.m_comHotel1.m_txtCurValue.text = hotelCfg.limitPosition.ToString();
+            _ui.m_comHotel1.m_txtNextAdd.text = flowerLimitAdd.ToString();
+            _ui.m_comHotel1.m_c1.selectedIndex = flowerLimitAdd > 0 ? 1 : 0;
 
+            int memberDayLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAdd - hotelCfg.limitDayAdd;
+            _ui.m_comHotel2.m_txtCurValue.text = hotelCfg.limitDayAdd.ToString();
+            _ui.m_comHotel2.m_txtNextAdd.text = memberDayLimitAdd.ToString();
+            _ui.m_comHotel2.m_c1.selectedIndex = memberDayLimitAdd > 0 ? 1 : 0;
 
+            int memberDayExtraLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAddExtra - hotelCfg.limitDayAddExtra;
+            _ui.m_comHotel3.m_txtCurValue.text = hotelCfg.limitDayAddExtra.ToString();
+            _ui.m_comHotel3.m_txtNextAdd.text = memberDayExtraLimitAdd.ToString();
+            _ui.m_comHotel3.m_c1.selectedIndex = memberDayExtraLimitAdd > 0 ? 1 : 0;
 
             if (nextHotelCfg == null)
             {