搭配赛补充提交

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_MatchingCompetitionRuleTips.cs

@@ -12,6 +12,7 @@ namespace UI.MatchingCompetition
         public GButton m_btnReward;
         public GButton m_btnRule;
         public GList m_rewardList;
+        public GTextField m_descText;
         public const string URL = "ui://ri3cveycp3ft28";
         public const string PACKAGE_NAME = "MatchingCompetition";
         public const string RES_NAME = "MatchingCompetitionRuleTips";
@@ -64,6 +65,7 @@ namespace UI.MatchingCompetition
             m_btnReward = (GButton)comp.GetChild("btnReward");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_rewardList = (GList)comp.GetChild("rewardList");
+            m_descText = (GTextField)comp.GetChild("descText");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +74,7 @@ namespace UI.MatchingCompetition
             m_btnReward = null;
             m_btnRule = null;
             m_rewardList = null;
+            m_descText = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionGatheringView.cs

@@ -120,18 +120,9 @@ namespace GFGGame
         {
             ViewManager.Show<DressUpView>(2, false);
         }
-        private async void OnClickBtnShop()
+        private void OnClickBtnShop()
         {
-            bool result = await MatchingCompetitionSproxy.ReqGetOnePlayers();
-            if(result)
-            {
-                ViewManager.Show<MatchingCompetitionUpLoadView>();
-            }
-            else
-            {
-                PromptController.Instance.ShowFloatTextPrompt("暂无玩家数据!");
-            }
-            //ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, 3 });
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionRuleTipsView.cs

@@ -42,6 +42,8 @@ namespace GFGGame
             base.OnShown();
             Season = MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason;
             _ui.m_rewardList.numItems = JudgingRoundRewardCfgArray.Instance.dataArray.Length;
+            string desc = TextDescCfgArray.Instance.GetCfg(300033).text;
+            _ui.m_descText.text = desc;
         }
 
         protected override void OnHide()
@@ -62,13 +64,14 @@ namespace GFGGame
             {
                 item.m_rewardList.itemRenderer = SpecialRewardRender;
             }
-            item.m_rewardList.data = index;
+            item.m_rewardList.data = judginRewardCfg.RewardArr;
             item.m_rewardList.numItems = judginRewardCfg.RewardArr.Length;
             UI_MatchingCompetitionRewardItem.ProxyEnd();
         }
         private static void SpecialRewardRender(int index, GObject obj)
         {
-            var itemInfo = (int[])obj.parent.data;
+            var item = (int[][])obj.parent.data;
+            var itemInfo = item[index];
             var itemData = ItemUtil.createItemData(itemInfo);
             var itemView = new ItemView(obj as GComponent);
             obj.data ??= itemView;