搭配赛补充提交，有问题回退这个

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

@@ -163,7 +163,8 @@ namespace GFGGame
             List<int> dressitemIDList = new List<int>();
             List<int> propIDList = new List<int>();
             List<TransformData> transDataList = new List<TransformData>();
-            DressUpBgID = 0;
+            DressUpBgID = 180001;
+            MathingDressDate.bgId = 180001;
             MathingDressDate.actionId = 0;
             DressPropTransInfoDic.Clear();
             for (int i = 0; i < AllDressIDInfoList.Count; i++)

GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -72,6 +72,7 @@ namespace GFGGame
                     await NewYearRedEnvelopeSProxy.ReqGetRedPacketInfo();
                     await ActivityGetYuanXiaoProxy.ReqGetActivityGameInfos();
                     await ActivityFYJYProxy.ReqGetActivityGameInfos();
+                    await MatchingCompetitionSproxy.ReqMatchingCompetitionInfo();
                     ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                     ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -327,9 +327,18 @@ namespace GFGGame
                 {
                     for (int i = 0; i < _equipSceneData[key].Count; i++)
                     {
-                        if(!MatchingCompetitionDataManager.Instance.DressPropTransInfoDic.ContainsKey(key.ToString()))
+                        bool isAdd = false;
+                        foreach (var item in MatchingCompetitionDataManager.Instance.DressPropTransInfoDic)
                         {
-                            MatchingCompetitionDataManager.Instance.DressPropTransInfoDic.Add(key.ToString(),new TransformData());
+                            if (MatchingCompetitionDataManager.Instance.GetIDByString(item.Key).ToString() == _equipSceneData[key][0].ToString())
+                            {
+                                isAdd = true;
+                                break;
+                            }                            
+                        }
+                        if(!isAdd)
+                        {
+                            MatchingCompetitionDataManager.Instance.DressPropTransInfoDic.Add(key.ToString(), new TransformData());
                         }
                     }
                 }
@@ -354,7 +363,7 @@ namespace GFGGame
                         }
                         else
                         {
-                           MatchingCompetitionDataManager.Instance.AddSceneItemOne(itemCfg,idList[1],idList[2]);
+                           MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg,false);
                         }                
                     }
                 }

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

@@ -99,8 +99,8 @@ namespace GFGGame
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.POEM) <= 0
                 || GuideDataManager.IsGuideFinish("ClothingSelectView") <= 0
-                || (GuideDataManager.IsGuideFinish("DAPEISAI_1") <=0 && MatchingCompetitionDataManager.Instance.MatchingState == 1 && MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason != 0)
-                || (GuideDataManager.IsGuideFinish("DAPEISAI_2") <= 0 && MatchingCompetitionDataManager.Instance.MatchingState == 2 && MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason != 0))
+                || (GuideDataManager.IsGuideFinish("DAPEISAI_1") <=0 && MatchingCompetitionDataManager.Instance.MatchingState == 1 && MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason != 0 && MainStoryDataManager.CheckLevelUnlock(100003004))
+                || (GuideDataManager.IsGuideFinish("DAPEISAI_2") <= 0 && MatchingCompetitionDataManager.Instance.MatchingState == 2 && MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason != 0 && MainStoryDataManager.CheckLevelUnlock(100003004)))
             //|| GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
             {
                 UpdateToCheckGuide(null);

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

@@ -142,17 +142,17 @@ namespace GFGGame
                         itemdata = MatchingOneDataManager.Instance.DressPropTransInfoDic[itemGObj.name];
                     }
                     MatchingOneDataManager.Instance.itemGameObjs[i].transform.position = itemdata.position;
-                    if (MatchingOneDataManager.Instance.itemGameObjs[i].name == "Role")
-                    {
-                        if(itemdata.position.y >= -5 || itemdata.position.y <= 5)
-                        {
-                            MatchingOneDataManager.Instance.itemGameObjs[i].transform.position = new Vector3(itemdata.position.x,0,0);
-                        }
-                        if(itemdata.position.x >= -5 || itemdata.position.x <= 5)
-                        {
-                            MatchingOneDataManager.Instance.itemGameObjs[i].transform.position = new Vector3(0, MatchingOneDataManager.Instance.itemGameObjs[i].transform.position.y, 0);
-                        }
-                    }
+                    //if (MatchingOneDataManager.Instance.itemGameObjs[i].name == "Role")
+                    //{
+                    //    if(itemdata.position.y >= -5 || itemdata.position.y <= 5)
+                    //    {
+                    //        MatchingOneDataManager.Instance.itemGameObjs[i].transform.position = new Vector3(itemdata.position.x,0,0);
+                    //    }
+                    //    if(itemdata.position.x >= -5 || itemdata.position.x <= 5)
+                    //    {
+                    //        MatchingOneDataManager.Instance.itemGameObjs[i].transform.position = new Vector3(0, MatchingOneDataManager.Instance.itemGameObjs[i].transform.position.y, 0);
+                    //    }
+                    //}
                     MatchingOneDataManager.Instance.itemGameObjs[i].transform.Rotate(itemGObj.transform.eulerAngles.x, itemGObj.transform.eulerAngles.y, itemdata.rotationZ);
                     MatchingOneDataManager.Instance.itemGameObjs[i].transform.localScale = itemdata.scale;
                     PhotographUtil.Instance.ChangeLayer(MatchingOneDataManager.Instance.itemGameObjs[i], (i+1) * PhotographDataManager.layerCount, "up");