浏览代码

搭配赛补充提交

zhangyuqian 11 月之前
父节点
当前提交
996c4a44c5

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Data/MatchingCompetitionDataManager.cs

@@ -560,6 +560,7 @@ namespace GFGGame
             List<int> dressitemIDList = new List<int>();
             List<int> propIDList = new List<int>();
             List<TransformData> transDataList = new List<TransformData>();
+            DressPropTransInfoDic.Clear();
             for (int i = 0; i < OneRoleInfo.JudgingInfo.CollocationInfoList.Count; i++)
             {
                 CollocationInfo colloctItemInfo = OneRoleInfo.JudgingInfo.CollocationInfoList[i];

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

@@ -44,6 +44,7 @@ namespace GFGGame
             List<int> dressitemIDList = new List<int>();
             List<int> propIDList = new List<int>();
             List<TransformData> transDataList = new List<TransformData>();
+            DressPropTransInfoDic.Clear();
             for (int i = 0; i < LeftRoleInfo.JudgingInfo.CollocationInfoList.Count; i++)
             {
                 CollocationInfo colloctItemInfo = LeftRoleInfo.JudgingInfo.CollocationInfoList[i];
@@ -153,6 +154,7 @@ namespace GFGGame
             List<int> dressitemIDList = new List<int>();
             List<int> propIDList = new List<int>();
             List<TransformData> transDataList = new List<TransformData>();
+            DressPropTransInfoDic.Clear();
             for (int i = 0; i < RightRoleInfo.JudgingInfo.CollocationInfoList.Count; i++)
             {
                 CollocationInfo colloctItemInfo = RightRoleInfo.JudgingInfo.CollocationInfoList[i];

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionRewardView.cs

@@ -139,7 +139,7 @@ namespace GFGGame
             }
             base.OnHide();
             //_effects.Clear();
-            EventAgent.DispatchEvent(ConstMessage.REWARDVIEW_CLOTHER);
+            //EventAgent.DispatchEvent(ConstMessage.REWARDVIEW_CLOTHER);
             GetSuitItemController.TryShow(0);
         }
         private void RenderListRewardItem(int index, GObject obj)

+ 20 - 4
GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionSelectView.cs

@@ -60,7 +60,7 @@ namespace GFGGame
             //isRefresh = (bool)this.viewData;       
             judgingCfg = JudgingRoundOpenCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason);
             UpdateView();
-            UpdatePlayer();
+            //UpdatePlayer();
             UpdateDressLeft();
             ViewManager.Hide<ModalStatusView>();
             Timers.inst.AddUpdate(CheckGuide);
@@ -100,7 +100,7 @@ namespace GFGGame
         {
             if (MatchingCompetitionDataManager.Instance.SpecialBonusList != null && MatchingCompetitionDataManager.Instance.SpecialBonusList.Count > 0)
             {
-                BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(MatchingCompetitionDataManager.Instance.SpecialBonusList)); ;
+                ViewManager.Show<MatchingCompetitionRewardView>(new object[] { ItemUtil.CreateItemDataList(MatchingCompetitionDataManager.Instance.SpecialBonusList), null });
                 MatchingCompetitionDataManager.Instance.SpecialBonusList = null;
             }
         }
@@ -151,7 +151,15 @@ namespace GFGGame
                 {
                     List<int> idList = MatchingCompetitionDataManager.Instance.GetIDListByString(item.Key);
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(idList[0]);
-                    MatchingCompetitionDataManager.Instance.AddSceneItemOne(itemCfg, idList[1], idList[2]);
+                    if (idList.Count > 1)
+                    {
+                        MatchingCompetitionDataManager.Instance.AddSceneItemOne(itemCfg, idList[1], idList[2]);
+                    }
+                    else
+                    {
+                        MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg, false);
+                    }
+                    //MatchingCompetitionDataManager.Instance.AddSceneItemOne(itemCfg, idList[1], idList[2]);
                 }
             }
             await Task.Delay(200);
@@ -227,7 +235,15 @@ namespace GFGGame
                 {
                     List<int> idList = MatchingCompetitionDataManager.Instance.GetIDListByString(item.Key);
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(idList[0]);
-                    MatchingCompetitionDataManager.Instance.AddSceneItemOne(itemCfg, idList[1], idList[2]);
+                    if (idList.Count > 1)
+                    {
+                        MatchingCompetitionDataManager.Instance.AddSceneItemOne(itemCfg, idList[1], idList[2]);
+                    }
+                    else
+                    {
+                        MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg, false);
+                    }
+                    //MatchingCompetitionDataManager.Instance.AddSceneItemOne(itemCfg, idList[1], idList[2]);
                 }
             }
             await Task.Delay(200);