搭配赛人口

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -256,5 +256,7 @@ namespace GFGGame
         public const string COLLEGE_UPGRADE = "COLLEGE_UPGRADE";
         //兑换成功
         public const string EXCHANGE_SUCCESS = "EXCHANGE_SUCCESS";
+        //搭配赛状态改变
+        public const string MATCHING_STATUSCHANGE = "MATCHING_STATUSCHANGE";
     }
 }

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

@@ -416,32 +416,6 @@ namespace GFGGame
         {
             ViewManager.Show<MatchingCompetitionRuleTipsView>();
         }
-        public async void OnClickBtnView()
-        {
-            if (MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason > 0)
-            {
-                if (MatchingCompetitionDataManager.Instance.MatchingState == 1)
-                {
-                    ViewManager.Show<MatchingCompetitionGatheringView>();
-                }
-                else
-                {
-                    bool result = await MatchingCompetitionSproxy.ReqGetOnePlayers();
-                    if (result)
-                    {
-                        ViewManager.Show<MatchingCompetitionUpLoadView>();
-                    }
-                    else
-                    {
-                        PromptController.Instance.ShowFloatTextPrompt("暂无玩家数据!");
-                    }
-                }
-            }
-            else
-            {
-                PromptController.Instance.ShowFloatTextPrompt("搭配赛未开启!");
-            }
-        }
     }
 
     class MatchingOneDataManager : SingletonBase<MatchingOneDataManager>

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -118,7 +118,7 @@ namespace GFGGame
 
         private void CheckFunOpen()
         {
-            _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name, false);
+            //_ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MatchingCompetitionGatheringView).Name, false);
             _ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
             _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
             _ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TimeTracingShowView).Name, false);
@@ -140,9 +140,31 @@ namespace GFGGame
             ViewManager.Show<TravelView>();
         }
 
-        private void OnClickBtnPoem()
+        private async void OnClickBtnPoem()
         {
-            ViewManager.Show<PoemPhotoView>();
+            if (MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason > 0)
+            {
+                if (MatchingCompetitionDataManager.Instance.MatchingState == 1)
+                {
+                    ViewManager.Show<MatchingCompetitionGatheringView>();
+                }
+                else
+                {
+                    bool result = await MatchingCompetitionSproxy.ReqGetOnePlayers();
+                    if (result)
+                    {
+                        ViewManager.Show<MatchingCompetitionUpLoadView>();
+                    }
+                    else
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("暂无玩家数据!");
+                    }
+                }
+            }
+            else
+            {
+                PromptController.Instance.ShowFloatTextPrompt("搭配赛未开启!");
+            }
         }
 
         private void OnClickBtnField()

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

@@ -39,6 +39,7 @@ namespace GFGGame
         private GButton _btnBag;
         private GButton _btnActivityDay7;
         private GButton _btnGallery;
+        private GButton _btnPoem;
         private List<EffectUI> _effectUIList = new List<EffectUI>();
         private UI_ButtonModle1[] _btns;
         private bool firstIn;
@@ -98,6 +99,7 @@ namespace GFGGame
             _btnTuJian = _ui.m_list.GetChild("btnTuJian").asButton;
             _btnBag = _ui.m_list.GetChild("btnBag").asButton;
             _btnGallery = _ui.m_list.GetChild("btnGallery").asButton;
+            _btnPoem = _ui.m_list.GetChild("btnPoem").asButton;
 
             _btnActivityDay7 = _ui.m_btnActivityDay7.target;
 
@@ -140,6 +142,7 @@ namespace GFGGame
             _ui.m_btnSevenReward.target.onClick.Add(OnClickSevenReward);
             _ui.m_btnPearRebate.target.onClick.Add(OnClickPearRabate);
             _btnGallery.onClick.Add(OnClickGallery);
+            _btnPoem.onClick.Add(OnClickPoem);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
             _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
@@ -514,6 +517,10 @@ namespace GFGGame
         {
             ViewManager.Show<PoemGalleryView>();
         }
+        private void OnClickPoem()
+        {
+            ViewManager.Show<PoemPhotoView>();
+        }
 
         private void OnClickBtnLeague()
         {