Merge remote-tracking branch 'remotes/org/master' into xiaojie

.gitattributes

@@ -0,0 +1,8 @@
+GameClient/ProjectSettings merge=ours
+GameClient/Assets/Plugins/Android/AndroidManifest.xml merge=ours
+GameClient/Assets/Plugins/Android/baseProjectTemplate.gradle merge=ours
+GameClient/Assets/Plugins/Android/gradleTemplate.properties merge=ours
+GameClient/Assets/Plugins/Android/launcherTemplate.gradle merge=ours
+GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java merge=ours
+GameClient/Assets/Plugins/com/easy/bugly/GamePlayerActivity.java merge=ours
+GameClient/Assets/Plugins merge=ours

.gitignore

@@ -45,6 +45,9 @@
 /GameClient/Assets/StreamingAssets/Bundles.meta
 /GameClient/Assets/StreamingAssets
 /StaticRes
+/GameClient/Assets/Plugins/Android/AndroidManifest.xml
+/GameClient/Assets/Plugins/Android/AndroidManifest.xml.meta
+/GameClient/ProjectSettings/ProjectSettings.asset
 /GameClient/.idea/.idea.GameClient/.idea/indexLayout.xml
 /GameClient/Assets/Plugins/Android/libs/douyou-release.aar
 /GameClient/Assets/Plugins/Android/libs/douyou-release.aar.meta

GameClient/Assets/Editor/ToolsMenu.cs

@@ -195,6 +195,11 @@ namespace GFGEditor
         public static void ImportExcel()
         {
             Log.ILog = new UnityLogger();
+            //清除缓存  
+            if (File.Exists(ExcelConfig.excelsCacheFolderPath))
+            {
+                File.Delete(ExcelConfig.excelsCacheFolderPath);
+            }
             ET.Options.Instance = new ET.Options();
             EditorUtility.DisplayProgressBar("进度", "正在导入表格", 1);
             SqliteController.Instance.Init(false, null);

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

@@ -256,5 +256,11 @@ namespace GFGGame
         public const string COLLEGE_UPGRADE = "COLLEGE_UPGRADE";
         //兑换成功
         public const string EXCHANGE_SUCCESS = "EXCHANGE_SUCCESS";
+        //搭配赛状态改变
+        public const string MATCHING_STATUSCHANGE = "MATCHING_STATUSCHANGE";
+        //爬塔开始挑战
+        public const string FieldWork_STARTCHANGE = "FieldWork_STARTCHANGE";
+        //奖励界面关闭
+        public const string REWARDVIEW_CLOTHER = "REWARDVIEW_CLOTHER";
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -224,7 +224,7 @@ namespace GFGGame
             await ActivitySProxy.ReqGetNewPlayerBonusStatus();
             await ActivitySProxy.GetNewPlayerOnceStatus();
             await ActivitySProxy.GetTipsStatus();
-            await ActivitySProxy.GetOnceStatus(5006);
+            await ActivitySProxy.GetOnceStatus(ActivityDataManager.Instance.activityZCJBId);
             await RoleInfoSProxy.GetThemeID();
             await MatchingCompetitionSproxy.ReqMatchingCompetitionInfo();
 
@@ -368,6 +368,8 @@ namespace GFGGame
             FightDataManager.Instance.Clear();
             MainDataManager.Instance.Clear();
             NewYearRedEnvelopeDataManager.Instance.Clear();
+            MatchingCompetitionDataManager.Instance.MyNtextture = null;
+            MatchingCompetitionDataManager.Instance.MathingDressDate.bgId = 0;
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

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

@@ -283,9 +283,16 @@ namespace GFGGame
         public int activityZCJBId = 61101;
         public bool CheckZCJBRed()
         {
+            List<ActivityDressCfg> zcjbCfgList = new List<ActivityDressCfg>();
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            zcjbCfgList = ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityId);
+            if (zcjbCfgList == null || zcjbCfgList.Count == 0)
+            {
+                return false;
+            }
             ItemData numItem;
             long num;
-            if(BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], out numItem))
+            if(BagDataManager.Instance.GetBagData().TryGetValue(zcjbCfgList[0].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -294,11 +301,11 @@ namespace GFGGame
                 num = 0;
             }
 
-            for (int i = 0; i < ActivityDressCfgArray.Instance.dataArray.Length - 1; i++)
+            for (int i = 0; i < zcjbCfgList.Count; i++)
             {
                     if (i == ActivityDataManager.Instance.ActivityZCJBList.Count)
                     {
-                        if (num >= ActivityDressCfgArray.Instance.dataArray[i].comsumeArr[0][1])
+                        if (num >= zcjbCfgList[i].comsumeArr[0][1])
                         {
                             return true;
                         }
@@ -391,15 +398,19 @@ namespace GFGGame
         }
         public bool isExtendTime(int day)
         {
-            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
-            long endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
-            long ExtendTime = (day * 24 * 60 * 60 * 1000);
-            long currentTime = TimeHelper.ServerNow();
-            if(currentTime > endTime)
+            int id = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(id);
+            if (activityCfg != null)
             {
-                if((currentTime - endTime) <= ExtendTime)
+                long endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
+                long ExtendTime = (day * 24 * 60 * 60 * 1000);
+                long currentTime = TimeHelper.ServerNow();
+                if (currentTime > endTime)
                 {
-                    return true;
+                    if ((currentTime - endTime) <= ExtendTime)
+                    {
+                        return true;
+                    }
                 }
             }
             return false;

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

@@ -215,6 +215,7 @@ namespace GFGGame
             foreach (var item in _starDic)
             {
                 var levelCfg = StoryLevelCfgArray.Instance.GetCfg(item.Key);
+                if (levelCfg == null) continue;
                 if (levelCfg.chapterId == chapterID && levelCfg.type == type && levelCfg.subType == subType)
                 {
                     star += item.Value;

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

@@ -50,7 +50,8 @@ namespace GFGGame
         public long WorksID = 0;
         public string TempPictureUrl = "";
         public int MatchingRemainingTimes = 1;
-        public MyWorksIdInfo myWorks;
+        public MyWorksIdInfo myWorks = new MyWorksIdInfo();
+        public List<ItemInfoProto> SpecialBonusList = new List<ItemInfoProto>();
         /// <summary>
         /// 搭配赛相册
         /// </summary>
@@ -59,6 +60,9 @@ namespace GFGGame
         public List<PoemPhotoData> MatchingPhotoInfos = new List<PoemPhotoData>();
         //角色详情界面图片信息
         public NTexture DetailNtexture;
+        //自己的搭配图片
+        public NTexture MyNtextture;
+        public byte[] MyBytes;
         //本期排行榜数据
         public List<MatchingPhotoWorksData> _currentRankList = new List<MatchingPhotoWorksData>();
         //往期作品集
@@ -162,6 +166,11 @@ namespace GFGGame
                             //记录道具和位置信息
                             propIDList.Add(AllDressIDInfoList[i].ItemId);
                             transDataList.Add(AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                            if (itemCfg.resLayer2 == "t" || itemCfg.resLayer3 == "t")
+                            {
+                                propIDList.Add(-3);
+                                transDataList.Add(AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                            }
                         }
                         else if (itemCfg != null && itemCfg.subType == ConstDressUpItemType.BEI_JING)
                         {
@@ -196,13 +205,16 @@ namespace GFGGame
         {
             TransformData transData = new TransformData();
             string[] parts = Regex.Split(strTrans, "_");
-            transData.position.x = float.Parse(parts[0]);
-            transData.position.y = float.Parse(parts[1]);
-            transData.position.z = float.Parse(parts[2]);
-            transData.rotationZ = float.Parse(parts[3]);
-            transData.scale.x = float.Parse(parts[4]);
-            transData.scale.y = float.Parse(parts[5]);
-            transData.scale.z = float.Parse(parts[6]);
+            if(parts.Length > 6)
+            {
+                transData.position.x = float.Parse(parts[0]);
+                transData.position.y = float.Parse(parts[1]);
+                transData.position.z = float.Parse(parts[2]);
+                transData.rotationZ = float.Parse(parts[3]);
+                transData.scale.x = float.Parse(parts[4]);
+                transData.scale.y = float.Parse(parts[5]);
+                transData.scale.z = float.Parse(parts[6]);
+            }
             return transData;
         }
         //存储道具信息
@@ -272,9 +284,11 @@ namespace GFGGame
                     if(flog_prefix == int.Parse(parts[0]))
                     {
                         if((flog_suffix == 3 && int.Parse(parts[1]) == 1)|| (flog_suffix == 1 && int.Parse(parts[1]) == 3))
-                        flog_prefix = 0;
-                        flog_suffix = 0;
-                        continue;
+                        {
+                            flog_prefix = 0;
+                            flog_suffix = 0;
+                            continue;
+                        }
                     }
                     flog_prefix = int.Parse(parts[0]);
                     flog_suffix = int.Parse(parts[1]);   
@@ -323,7 +337,14 @@ namespace GFGGame
             }
             else
             {
-                itemGameObjs.Insert(indexRoleData, roleGameobj);
+                if (indexRoleData > itemGameObjs.Count)
+                {
+                    itemGameObjs.Add(roleGameobj);
+                }
+                else
+                {
+                    itemGameObjs.Insert(indexRoleData, roleGameobj);
+                }
             }  
         }
         public void SetNumToRank(int index,UI_Component4 rankCom)
@@ -338,7 +359,7 @@ namespace GFGGame
             {
                 c1 = 0;
             }
-            else if(index >9 && index <= 20)
+            else if(index >9 && index <= 50)
             {
                 c1 = 1;
             }
@@ -361,17 +382,37 @@ namespace GFGGame
             }
             else
             {
-                rankCom.m_RankText.text = index.ToString();
+                if (index == 0)
+                {
+                    rankCom.m_RankText.text = "--";
+                }
+                else
+                {
+                    for (int i = 11; i < JudgingRoundRewardCfgArray.Instance.dataArray.Length-1; i++)
+                    {
+                        JudgingRoundRewardCfg judgingCfg = JudgingRoundRewardCfgArray.Instance.GetCfg(i);
+                        JudgingRoundRewardCfg judgingNextCfg = JudgingRoundRewardCfgArray.Instance.GetCfg(i+1);
+                        if (index >= judgingCfg.rank && index < judgingNextCfg.rank)
+                        {
+                            rankCom.m_RankText.text = judgingNextCfg.desc;
+                        }
+                        else
+                        {
+                            rankCom.m_RankText.text = index.ToString();
+                        }
+                    }
+                }
+                
             }
 
         }
-        public async void AddSceneItem(ItemCfg itemCfg, bool setLayer)
+        public async void AddSceneItem(ItemCfg itemCfg, bool setLayer,int isLeft = 0)
         {
             Vector3 pos = Vector3.zero;
             if (!string.IsNullOrEmpty(itemCfg.resLayer3))
             {
                 GameObject parentGameObj3 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 3));
-                await PhotographSceneManager.Instance.AddSceneItem(parentGameObj3, itemCfg, 3, setLayer);
+                await PhotographSceneManager.Instance.AddSceneItem(parentGameObj3, itemCfg, 3, setLayer,false,isLeft);
                 if (setLayer)
                 {
                     if (parentGameObj3.transform.childCount > 0)
@@ -384,7 +425,7 @@ namespace GFGGame
             if (!string.IsNullOrEmpty(itemCfg.resLayer2))
             {
                 GameObject parentGameObj2 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 2));
-                await PhotographSceneManager.Instance.AddSceneItem(parentGameObj2, itemCfg, 2, setLayer);
+                await PhotographSceneManager.Instance.AddSceneItem(parentGameObj2, itemCfg, 2, setLayer,false, isLeft);
                 if (setLayer)
                 {
                     if (parentGameObj2.transform.childCount > 0)
@@ -399,7 +440,7 @@ namespace GFGGame
             {
 
                 GameObject parentGameObj1 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 1));
-                await PhotographSceneManager.Instance.AddSceneItem(parentGameObj1, itemCfg, 1, setLayer);
+                await PhotographSceneManager.Instance.AddSceneItem(parentGameObj1, itemCfg, 1, setLayer, false, isLeft);
 
                 if (setLayer)
                 {
@@ -416,32 +457,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>
@@ -479,17 +494,27 @@ namespace GFGGame
                 if (OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId == roleID)
                 {
                     propIDList.Add(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                    transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
                 }
                 else
                 {
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
                     if (itemCfg != null && itemCfg.itemType == ConstItemType.DRESS_UP)
                     {
-                        if (itemCfg.subType == 9 || itemCfg.subType == 10 || itemCfg.subType == 11 || itemCfg.subType == 12)
+                        if (itemCfg.subType == 19 || itemCfg.subType == 17 || itemCfg.subType == 21 || itemCfg.subType == 22)
                         {
                             //记录道具和位置信息
                             propIDList.Add(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
                             transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                            if(itemCfg.resLayer2 == "t" || itemCfg.resLayer3 == "t")
+                            {
+                                propIDList.Add(-3);
+                                transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                            }
+                        }
+                        else if (itemCfg != null && itemCfg.subType == ConstDressUpItemType.BEI_JING)
+                        {
+                            DressUpBgID = itemCfg.id;
                         }
                         else
                         {
@@ -526,16 +551,15 @@ namespace GFGGame
             }
             else
             {
-                itemGameObjs.Insert(indexRoleData, roleGameobj);
+                if (indexRoleData > itemGameObjs.Count)
+                {
+                    itemGameObjs.Add(roleGameobj);
+                }
+                else
+                {
+                    itemGameObjs.Insert(indexRoleData, roleGameobj);
+                }
             }
         }
     }
-
-    class MatchingTwoDataManager : SingletonBase<MatchingTwoDataManager>
-    {
-        //其他玩家信息用于展示
-        public MatchingPhotoWorksData LeftRoleInfo = new MatchingPhotoWorksData();
-        //其他玩家信息用于展示
-        public MatchingPhotoWorksData RightRoleInfo = new MatchingPhotoWorksData();
-    }
 }

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

@@ -123,5 +123,37 @@ namespace GFGGame
                     }
                 }
             }
+
+        public static IEnumerator DownloadMyself(string nTextture)
+        {
+            yield return DownloadMyPicture(nTextture, 1);
+            ET.Log.Debug("Download  finish!!!");
+            EventAgent.DispatchEvent(ConstMessage.DOWNLOAD_FINISH);
+        }
+
+        private static IEnumerator DownloadMyPicture(string nTextture, int count)
+        {
+            if (count >= 3)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("下载失败");
+                ViewManager.Hide<ModalStatusView>();
+                yield break;
+            }
+            using (UnityWebRequest request = UnityWebRequestTexture.GetTexture(nTextture))
+            {
+                yield return request.SendWebRequest();
+                if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError)
+                {
+                    count += 1;
+                    yield return DownloadMyPicture(nTextture, count);
+                }
+                else
+                {
+                    Texture2D texture = (request.downloadHandler as DownloadHandlerTexture).texture;
+                    MatchingCompetitionDataManager.Instance.MyNtextture = new NTexture(texture);
+                    MatchingCompetitionDataManager.Instance.MyBytes = texture.EncodeToJPG();
+                }
+            }
+        }
     }
 }

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

@@ -0,0 +1,220 @@
+using ET;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using UnityEngine;
+using Live2D.Cubism.Rendering;
+using FairyGUI;
+using UI.MatchingCompetition;
+
+namespace GFGGame
+{
+    class MatchingLeftDataManager : SingletonBase<MatchingLeftDataManager>
+    {
+        //其他玩家信息用于展示
+        public MatchingPhotoWorksData LeftRoleInfo = new MatchingPhotoWorksData();
+        //人物位置信息
+        public TransformData roleTransFormData = new TransformData();
+        public GameObject roleGameobj;
+        public int roleID = -1;
+        //*********************搭配数据*********************************
+        //需要传输的数据：MathingDressDate，DressUpBgID，DressPropIdList，TransformDataList，
+        public DressUpData MathingDressDate = DressUpData.CreateDefault();
+        public int DressUpBgID = 0;
+        //*****这两个id放列表的最后面
+        //边框id
+        public int BorderID = 0;
+        //NpcId
+        public int NpcID = 0;
+        //道具数据,一一对应
+        //道具id
+        public List<int> DressPropIdList = new List<int>();
+        //道具位置信息
+        public List<TransformData> TransformDataList = new List<TransformData>();
+        public List<GameObject> itemGameObjs = new List<GameObject>();
+        //***************************************************************
+        //解析后台获取的信息
+        public void AnalysisInfoToList()
+        {
+            List<int> dressitemIDList = new List<int>();
+            List<int> propIDList = new List<int>();
+            List<TransformData> transDataList = new List<TransformData>();
+            for (int i = 0; i < LeftRoleInfo.JudgingInfo.CollocationInfoList.Count; i++)
+            {
+                if (LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId == roleID)
+                {
+                    propIDList.Add(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                    transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                }
+                else
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                    if (itemCfg != null && itemCfg.itemType == ConstItemType.DRESS_UP)
+                    {
+                        if (itemCfg.subType == 19 || itemCfg.subType == 17 || itemCfg.subType == 21 || itemCfg.subType == 22)
+                        {
+                            //记录道具和位置信息
+                            propIDList.Add(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                            transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                            if (itemCfg.resLayer2 == "t" || itemCfg.resLayer3 == "t")
+                            {
+                                propIDList.Add(-3);
+                                transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                            }
+                        }
+                        else if (itemCfg != null && itemCfg.subType == ConstDressUpItemType.BEI_JING)
+                        {
+                            DressUpBgID = itemCfg.id;
+                        }
+                        else
+                        {
+                            dressitemIDList.Add(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                        }
+                    }
+                    else if (itemCfg != null && itemCfg.itemType == ConstItemType.PHOTOGRAPH)
+                    {
+                        //记录道具和位置信息
+                        propIDList.Add(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                        transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                    }
+                }
+            }
+            MathingDressDate.itemList = dressitemIDList;
+            MathingDressDate.actionId = LeftRoleInfo.JudgingInfo.ActionId;
+            DressPropIdList = propIDList;
+            TransformDataList = transDataList;
+            DressUpBgID = LeftRoleInfo.JudgingInfo.BagId;
+        }
+        public void InsertGameObjectList()
+        {
+            int indexRoleData = 0;
+            for (int i = 0; i < DressPropIdList.Count; i++)
+            {
+                if (DressPropIdList[i] == roleID)
+                {
+                    indexRoleData = i;
+                }
+            }
+            if (itemGameObjs.Count == 0)
+            {
+                itemGameObjs.Add(roleGameobj);
+            }
+            else
+            {
+                if(indexRoleData > itemGameObjs.Count)
+                {
+                    itemGameObjs.Add(roleGameobj);
+                }
+                else
+                {
+                    itemGameObjs.Insert(indexRoleData, roleGameobj);
+                } 
+            }
+        }
+    }
+
+    class MatchingRightDataManager : SingletonBase<MatchingRightDataManager>
+    {
+        //其他玩家信息用于展示
+        public MatchingPhotoWorksData RightRoleInfo = new MatchingPhotoWorksData();
+        //人物位置信息
+        public TransformData roleTransFormData = new TransformData();
+        public GameObject roleGameobj;
+        public int roleID = -1;
+        //*********************搭配数据*********************************
+        //需要传输的数据：MathingDressDate，DressUpBgID，DressPropIdList，TransformDataList，
+        public DressUpData MathingDressDate = DressUpData.CreateDefault();
+        public int DressUpBgID = 0;
+        //*****这两个id放列表的最后面
+        //边框id
+        public int BorderID = 0;
+        //NpcId
+        public int NpcID = 0;
+        //道具数据,一一对应
+        //道具id
+        public List<int> DressPropIdList = new List<int>();
+        //道具位置信息
+        public List<TransformData> TransformDataList = new List<TransformData>();
+        public List<GameObject> itemGameObjs = new List<GameObject>();
+        //***************************************************************
+        //解析后台获取的信息
+        public void AnalysisInfoToList()
+        {
+            List<int> dressitemIDList = new List<int>();
+            List<int> propIDList = new List<int>();
+            List<TransformData> transDataList = new List<TransformData>();
+            for (int i = 0; i < RightRoleInfo.JudgingInfo.CollocationInfoList.Count; i++)
+            {
+                if (RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId == roleID)
+                {
+                    propIDList.Add(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                    transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                }
+                else
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                    if (itemCfg != null && itemCfg.itemType == ConstItemType.DRESS_UP)
+                    {
+                        if (itemCfg.subType == 19 || itemCfg.subType == 17 || itemCfg.subType == 21 || itemCfg.subType == 22)
+                        {
+                            //记录道具和位置信息
+                            propIDList.Add(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                            transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                            if ( itemCfg.resLayer2 == "t" || itemCfg.resLayer3 == "t")
+                            {
+                                propIDList.Add(-3);
+                                transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                            }
+                        }
+                        else if (itemCfg != null && itemCfg.subType == ConstDressUpItemType.BEI_JING)
+                        {
+                            DressUpBgID = itemCfg.id;
+                        }
+                        else
+                        {
+                            dressitemIDList.Add(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                        }
+                    }
+                    else if (itemCfg != null && itemCfg.itemType == ConstItemType.PHOTOGRAPH)
+                    {
+                        //记录道具和位置信息
+                        propIDList.Add(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                        transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                    }
+                }
+            }
+            MathingDressDate.itemList = dressitemIDList;
+            MathingDressDate.actionId = RightRoleInfo.JudgingInfo.ActionId;
+            DressPropIdList = propIDList;
+            TransformDataList = transDataList;
+            DressUpBgID = RightRoleInfo.JudgingInfo.BagId;
+        }
+        public void InsertGameObjectList()
+        {
+            int indexRoleData = 0;
+            for (int i = 0; i < DressPropIdList.Count; i++)
+            {
+                if (DressPropIdList[i] == roleID)
+                {
+                    indexRoleData = i;
+                }
+            }
+            if (itemGameObjs.Count == 0)
+            {
+                itemGameObjs.Add(roleGameobj);
+            }
+            else
+            {
+                if (indexRoleData > itemGameObjs.Count)
+                {
+                    itemGameObjs.Add(roleGameobj);
+                }
+                else
+                {
+                    itemGameObjs.Insert(indexRoleData, roleGameobj);
+                }
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/MatchingTwoDataManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f840fc6b2d52a1d4fbbc79221ec6e67f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -58,21 +58,43 @@ namespace GFGGame
             SetBoxCollider2DToGameObject(tf.gameObject);
             AddItemGameObjectToList(tf.parent.gameObject, true);
         }
-        public void AddBodyItem()
+        public void AddBodyItem(int isLeft = 0)
         {
             GameObject bodyParent = sceneObject.transform.Find("Scene/Role").gameObject;
 
-            MatchingCompetitionDataManager.Instance.roleGameobj = bodyParent;
-            MatchingOneDataManager.Instance.roleGameobj = bodyParent;
+            if (isLeft == 1)
+            {
+                MatchingLeftDataManager.Instance.roleGameobj = bodyParent;
+            }
+            else if (isLeft == 2)
+            {
+                MatchingRightDataManager.Instance.roleGameobj = bodyParent;
+            }
+            else
+            {
+                MatchingCompetitionDataManager.Instance.roleGameobj = bodyParent;
+                MatchingOneDataManager.Instance.roleGameobj = bodyParent;
+            }
 
             UpdatePhotographBody(sceneObject, bodyParent);
             AddItemGameObjectToList(bodyParent, false);
         }
 
-        public async Task AddSceneItem(GameObject parentGameObj, ItemCfg itemCfg, int layer, bool setLayer, bool isOnlyEff = false)
+        public async Task AddSceneItem(GameObject parentGameObj, ItemCfg itemCfg, int layer, bool setLayer, bool isOnlyEff = false,int isLeft = 0)
         {
-            MatchingCompetitionDataManager.Instance.itemGameObjs.Add(parentGameObj);
-            MatchingOneDataManager.Instance.itemGameObjs.Add(parentGameObj);
+            if(isLeft == 1)
+            {
+                MatchingLeftDataManager.Instance.itemGameObjs.Add(parentGameObj);
+            }
+            else if(isLeft == 2)
+            {
+                MatchingRightDataManager.Instance.itemGameObjs.Add(parentGameObj);
+            }
+            else
+            {
+                MatchingCompetitionDataManager.Instance.itemGameObjs.Add(parentGameObj);
+                MatchingOneDataManager.Instance.itemGameObjs.Add(parentGameObj);
+            }
 
             await AddItemToScene(sceneObject, parentGameObj, itemCfg.id, layer);
 

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -450,6 +450,19 @@ namespace GFGGame
             {
                 _dressUpData.itemList.Add(itemId);
                 Update(itemId);
+
+                if (actionId != 0)
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+                    Transform effGameobj = _sceneObj.transform.Find(string.Format("Role/Body_eff/{0}", itemCfg.res));
+                    if (effGameobj != null)
+                    {
+                        if (effGameobj.gameObject != null)
+                        {
+                            effGameobj.gameObject.SetActive(true);
+                        }
+                    }
+                }
             }
         }
 
@@ -471,6 +484,19 @@ namespace GFGGame
                 _dressUpData.itemList.Remove(itemId);
                 var handler = DressUpUtil.RemoveItemAsync(itemId, _sceneObj, _roleObj);
                 TryAddHandler(handler);
+
+                if (actionId != 0)
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+                    Transform effGameobj = _sceneObj.transform.Find(string.Format("Role/Body_eff/{0}", itemCfg.res));
+                    if (effGameobj != null)
+                    {
+                        if (effGameobj.gameObject != null)
+                        {
+                            effGameobj.gameObject.SetActive(false);
+                        }
+                    }
+                }
             }
         }
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryDialogUI.cs

@@ -13,6 +13,7 @@ namespace UI.Main
         public GGraph m_mask2;
         public GGraph m_btnNext;
         public GGraph m_effect;
+        public GGraph m_roleLive;
         public UI_CompDialogText m_dialogText;
         public UI_CompDialogName m_dialogName;
         public UI_CompDialogHead m_dialogHead;
@@ -86,6 +87,7 @@ namespace UI.Main
             m_mask2 = (GGraph)comp.GetChild("mask2");
             m_btnNext = (GGraph)comp.GetChild("btnNext");
             m_effect = (GGraph)comp.GetChild("effect");
+            m_roleLive = (GGraph)comp.GetChild("roleLive");
             m_dialogText = (UI_CompDialogText)UI_CompDialogText.Create(comp.GetChild("dialogText"));
             m_dialogName = (UI_CompDialogName)UI_CompDialogName.Create(comp.GetChild("dialogName"));
             m_dialogHead = (UI_CompDialogHead)UI_CompDialogHead.Create(comp.GetChild("dialogHead"));
@@ -115,6 +117,7 @@ namespace UI.Main
             m_mask2 = null;
             m_btnNext = null;
             m_effect = null;
+            m_roleLive = null;
             m_dialogText.Dispose();
             m_dialogText = null;
             m_dialogName.Dispose();

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_ComRewardList
+    {
+        public GComponent target;
+        public GList m_listReward;
+        public const string URL = "ui://ri3cveycjw093y";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "ComRewardList";
+        private static UI_ComRewardList _proxy;
+
+        public static UI_ComRewardList Create(GObject gObject = null)
+        {
+            var ui = new UI_ComRewardList();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComRewardList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComRewardList();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_listReward = (GList)comp.GetChild("listReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_ComRewardList.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fa1731df43f00fa49ac2735e20488e07
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -10,13 +10,14 @@ namespace UI.MatchingCompetition
         public Controller m_c1;
         public GLoader m_bg;
         public GGraph m_suitShow;
-        public GButton m_BtnBack;
+        public GLoader m_playerImage;
         public GLoader m_ruleBtn;
         public GTextField m_titleText;
         public GTextField m_timeText;
         public GTextField m_suitName;
         public GButton m_btnUploadWorks;
         public GButton m_btnShop;
+        public GButton m_BtnBack;
         public const string URL = "ui://ri3cveychtuj0";
         public const string PACKAGE_NAME = "MatchingCompetition";
         public const string RES_NAME = "MatchingCompetitionGatheringUI";
@@ -67,26 +68,28 @@ namespace UI.MatchingCompetition
             m_c1 = comp.GetController("c1");
             m_bg = (GLoader)comp.GetChild("bg");
             m_suitShow = (GGraph)comp.GetChild("suitShow");
-            m_BtnBack = (GButton)comp.GetChild("BtnBack");
+            m_playerImage = (GLoader)comp.GetChild("playerImage");
             m_ruleBtn = (GLoader)comp.GetChild("ruleBtn");
             m_titleText = (GTextField)comp.GetChild("titleText");
             m_timeText = (GTextField)comp.GetChild("timeText");
             m_suitName = (GTextField)comp.GetChild("suitName");
             m_btnUploadWorks = (GButton)comp.GetChild("btnUploadWorks");
             m_btnShop = (GButton)comp.GetChild("btnShop");
+            m_BtnBack = (GButton)comp.GetChild("BtnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_bg = null;
             m_suitShow = null;
-            m_BtnBack = null;
+            m_playerImage = null;
             m_ruleBtn = null;
             m_titleText = null;
             m_timeText = null;
             m_suitName = null;
             m_btnUploadWorks = null;
             m_btnShop = null;
+            m_BtnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,7 +8,7 @@ namespace UI.MatchingCompetition
     {
         public GComponent target;
         public GLoader m_bg;
-        public GImage m_playerImage;
+        public GLoader m_playerImage;
         public GButton m_BtnBack;
         public const string URL = "ui://ri3cveycp3ft1r";
         public const string PACKAGE_NAME = "MatchingCompetition";
@@ -58,7 +58,7 @@ namespace UI.MatchingCompetition
         private void Init(GComponent comp)
         {
             m_bg = (GLoader)comp.GetChild("bg");
-            m_playerImage = (GImage)comp.GetChild("playerImage");
+            m_playerImage = (GLoader)comp.GetChild("playerImage");
             m_BtnBack = (GButton)comp.GetChild("BtnBack");
         }
         public void Dispose(bool disposeTarget = false)

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

@@ -0,0 +1,90 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionRewardUI
+    {
+        public GComponent target;
+        public GGraph m_mask;
+        public GGraph m_holderBgCom;
+        public GGraph m_holderTitle;
+        public GGroup m_downTipsText;
+        public UI_ComRewardList m_comList;
+        public GGroup m_grp;
+        public Transition m_openViewAction;
+        public const string URL = "ui://ri3cveycjw093x";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionRewardUI";
+        private static UI_MatchingCompetitionRewardUI _proxy;
+
+        public static UI_MatchingCompetitionRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionRewardUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MatchingCompetitionRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionRewardUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_mask = (GGraph)comp.GetChild("mask");
+            m_holderBgCom = (GGraph)comp.GetChild("holderBgCom");
+            m_holderTitle = (GGraph)comp.GetChild("holderTitle");
+            m_downTipsText = (GGroup)comp.GetChild("downTipsText");
+            m_comList = (UI_ComRewardList)UI_ComRewardList.Create(comp.GetChild("comList"));
+            m_grp = (GGroup)comp.GetChild("grp");
+            m_openViewAction = comp.GetTransition("openViewAction");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_mask = null;
+            m_holderBgCom = null;
+            m_holderTitle = null;
+            m_downTipsText = null;
+            m_comList.Dispose();
+            m_comList = null;
+            m_grp = null;
+            m_openViewAction = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_MatchingCompetitionRewardUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b5c5269a03a26f94698d3db4ed300df9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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/FairyGUI/GenCode/MatchingCompetition/UI_MatchingCompetitionSelectUI.cs

@@ -14,11 +14,11 @@ namespace UI.MatchingCompetition
         public GTextField m_titleText;
         public UI_Component11 m_player1;
         public UI_Component11 m_player2;
-        public GTextField m_timeText;
         public UI_Button3 m_select1;
         public GTextField m_selectText1;
         public UI_Button3 m_select2;
         public GTextField m_selectText2;
+        public GTextField m_timeText;
         public GButton m_BtnBack;
         public Transition m_t0;
         public Transition m_t1;
@@ -76,11 +76,11 @@ namespace UI.MatchingCompetition
             m_titleText = (GTextField)comp.GetChild("titleText");
             m_player1 = (UI_Component11)UI_Component11.Create(comp.GetChild("player1"));
             m_player2 = (UI_Component11)UI_Component11.Create(comp.GetChild("player2"));
-            m_timeText = (GTextField)comp.GetChild("timeText");
             m_select1 = (UI_Button3)UI_Button3.Create(comp.GetChild("select1"));
             m_selectText1 = (GTextField)comp.GetChild("selectText1");
             m_select2 = (UI_Button3)UI_Button3.Create(comp.GetChild("select2"));
             m_selectText2 = (GTextField)comp.GetChild("selectText2");
+            m_timeText = (GTextField)comp.GetChild("timeText");
             m_BtnBack = (GButton)comp.GetChild("BtnBack");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
@@ -98,13 +98,13 @@ namespace UI.MatchingCompetition
             m_player1 = null;
             m_player2.Dispose();
             m_player2 = null;
-            m_timeText = null;
             m_select1.Dispose();
             m_select1 = null;
             m_selectText1 = null;
             m_select2.Dispose();
             m_select2 = null;
             m_selectText2 = null;
+            m_timeText = null;
             m_BtnBack = null;
             m_t0 = null;
             m_t1 = null;

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

@@ -19,6 +19,7 @@ namespace UI.MatchingCompetition
         public GButton m_btnUploadWorks;
         public GButton m_btnShop;
         public GButton m_btnMyWorks;
+        public GButton m_beforeWork;
         public UI_Component1 m_playerHead;
         public GButton m_btnExchage;
         public GLoader m_countTime;
@@ -81,6 +82,7 @@ namespace UI.MatchingCompetition
             m_btnUploadWorks = (GButton)comp.GetChild("btnUploadWorks");
             m_btnShop = (GButton)comp.GetChild("btnShop");
             m_btnMyWorks = (GButton)comp.GetChild("btnMyWorks");
+            m_beforeWork = (GButton)comp.GetChild("beforeWork");
             m_playerHead = (UI_Component1)UI_Component1.Create(comp.GetChild("playerHead"));
             m_btnExchage = (GButton)comp.GetChild("btnExchage");
             m_countTime = (GLoader)comp.GetChild("countTime");
@@ -99,6 +101,7 @@ namespace UI.MatchingCompetition
             m_btnUploadWorks = null;
             m_btnShop = null;
             m_btnMyWorks = null;
+            m_beforeWork = null;
             m_playerHead.Dispose();
             m_playerHead = null;
             m_btnExchage = null;

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

@@ -247,9 +247,13 @@ namespace GFGGame
         //招财进宝活动
         public static async ETTask<bool> ReqActivityZCJBInfo(int id = 5006)
         {
-            ActivityDataManager.Instance.activityZCJBId = ActivityOpenCfgArray.Instance.GetCfg(5006).paramsArr[0];
+            int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            if (activityID != 0)
+            {
+                ActivityDataManager.Instance.activityZCJBId = ActivityOpenCfgArray.Instance.GetCfg(activityID).paramsArr[0];
+            }
             S2C_GetDressRewrdStatusList response = null;
-            response = (S2C_GetDressRewrdStatusList)await MessageHelper.SendToServer(new C2S_GetDressRewrdStatusList() { ActivityId = id });
+            response = (S2C_GetDressRewrdStatusList)await MessageHelper.SendToServer(new C2S_GetDressRewrdStatusList() { ActivityId = activityID });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

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

@@ -14,6 +14,7 @@ namespace ET
             MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason = message.JudgingRoundOpenId;
             MatchingCompetitionDataManager.Instance.MatchingEndTimes = message.PhaseEndTime;
             MatchingCompetitionDataManager.Instance.MatchingState = message.PhaseType;
+            //await MatchingCompetitionSproxy.ReqMatchingCompetitionInfo();
             await ETTask.CompletedTask;
         }
     }
@@ -30,15 +31,21 @@ namespace GFGGame
             MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason = response.JudgingRoundOpenId;
             MatchingCompetitionDataManager.Instance.MatchingState = response.PhaseType;
             MatchingCompetitionDataManager.Instance.MatchingEndTimes = response.PhaseEndTime;
-            MatchingCompetitionDataManager.Instance.myWorks = response.MyWorks;
+            MatchingCompetitionDataManager.Instance.MatchingRemainingTimes = response.Num;
             if(response.MyWorks != null)
             {
+                MatchingCompetitionDataManager.Instance.myWorks = response.MyWorks;
                 MatchingCompetitionDataManager.Instance.AllDressIDInfoList = response.MyWorks.CollocationInfoList;
             }
             else
             {
+                MatchingCompetitionDataManager.Instance.myWorks.Score = 0;
                 MatchingCompetitionDataManager.Instance.AllDressIDInfoList = new List<CollocationInfo>();
             }
+            if(response.MyWorks != null && response.MyWorks.PictureTempUrl != "")
+            {
+                Timers.inst.StartCoroutine(MatchingPhotoHelper.DownloadMyself(response.MyWorks.PictureTempUrl));
+            }
             MatchingCompetitionDataManager.Instance.AnalysisInfoToList();
             return true;
         }
@@ -87,7 +94,7 @@ namespace GFGGame
                 WorksId = MatchingCompetitionDataManager.Instance.WorksID
             }) ;
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-
+            
             return true;
         }
 
@@ -100,16 +107,19 @@ namespace GFGGame
             {
                 return false;
             }
-            MatchingTwoDataManager.Instance.LeftRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[0];
+            MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[0];
             if(response.JudgingRoundRoleInfoList[0] != null)
             {
-                Timers.inst.StartCoroutine(MatchingPhotoHelper.Download(MatchingTwoDataManager.Instance.LeftRoleInfo));
+                Timers.inst.StartCoroutine(MatchingPhotoHelper.Download(MatchingLeftDataManager.Instance.LeftRoleInfo));
             }
-            MatchingTwoDataManager.Instance.RightRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[1];
+            MatchingLeftDataManager.Instance.AnalysisInfoToList();
+
+            MatchingRightDataManager.Instance.RightRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[1];
             if (response.JudgingRoundRoleInfoList[1] != null)
             {
-                Timers.inst.StartCoroutine(MatchingPhotoHelper.Download(MatchingTwoDataManager.Instance.RightRoleInfo));
+                Timers.inst.StartCoroutine(MatchingPhotoHelper.Download(MatchingRightDataManager.Instance.RightRoleInfo));
             }
+            MatchingRightDataManager.Instance.AnalysisInfoToList();
             return true;
         }
         //选择搭配作品
@@ -125,8 +135,18 @@ namespace GFGGame
             {
                 return false;
             }
-            MatchingTwoDataManager.Instance.LeftRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[0];
-            MatchingTwoDataManager.Instance.RightRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[1];
+            MatchingCompetitionDataManager.Instance.MatchingRemainingTimes = response.Num;
+            MatchingCompetitionDataManager.Instance.SpecialBonusList = response.SpecialBonusList;
+            if (MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo.WorksId == workID)
+            {
+                MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[0];
+                MatchingRightDataManager.Instance.RightRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[1];
+            }
+            else
+            {
+                MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[1];
+                MatchingRightDataManager.Instance.RightRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[0];
+            }
             BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
             return true;
         }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -31,6 +31,8 @@ namespace GFGGame
         private string[] effArray = new string[2] { "ZJ_JuQing", "ZJ_ZD" };
 
         private int currentDifficulty;
+
+        private int activityID;
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -112,7 +114,7 @@ namespace GFGGame
                 _chapterID = (int)this.viewData;
             }
             MainStoryDataManager.currentChapterCfgId = _chapterID;
-
+            activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
             //由于这里会切换特效，所以切换界面时进行清空
             EffectUIPool.Recycle(_effectUI2);
             _effectUI2 = null;
@@ -138,12 +140,12 @@ namespace GFGGame
             UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
             valueBar.m_c1.selectedIndex = 12;
             UI_ComponentValueBar.ProxyEnd();
-            _valueBarController.UpdateList(new List<int>() { ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
+            _valueBarController.UpdateList(new List<int>() { ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityID)[0].comsumeArr[0][0], ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
             _ui.m_selectChapter.visible = false;
             _ui.m_switchChapter.target.visible = false;
             _ui.m_bonusBox.visible = false;
             _ui.m_ActivityZCJB.visible = true;
-            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
@@ -200,12 +202,12 @@ namespace GFGGame
             currentDifficulty = chapterCfg.type;
             if (currentDifficulty == 1)
             {
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("wxsg_bj");
             }
             else
             {
                 currentDifficulty = 0;
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("wxsg_bj");
             }
             //_comEff.visible = false;
             //_effFirst.visible = false;
@@ -251,8 +253,10 @@ namespace GFGGame
                         levelItem.m_c1.selectedIndex = 0;
                         levelItem.m_flower.target.visible = false;
                         levelItem.m_txtName.text = levelCfg.name;
+                        levelItem.m_comDialogBg.m_loabg.url = ResPathUtil.GetBgImgPath("wxsg_zjBg");
+                        levelItem.m_comDialogBg.m_loaIcon.url = ResPathUtil.GetChapterGuideIconPath("wxsg_zjBg");
                         levelItem.m_comDialogBg.m_c1.selectedIndex = Random.Range(0, 10);
-
+                        levelItem.m_txtDialogOrder.text = showId;
                     }
 
                     //根据困难程度选择显示图片
@@ -376,7 +380,7 @@ namespace GFGGame
 
         private void UpdateActivityTime(object param = null)
         {
-            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime)

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs

@@ -37,10 +37,11 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            UpdateList();
+            
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
             zcjbCfgList = ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityId);
             _ui.m_List.numItems = zcjbCfgList.Count;
+            UpdateList();
             _ui.m_List.ScrollToView(Mathf.Max(0, ActivityDataManager.Instance.ActivityZCJBList.Count - 1), false, true);
         }
         protected override void OnHide()
@@ -124,7 +125,7 @@ namespace GFGGame
             UI_ActivityRewardItemUI item = UI_ActivityRewardItemUI.Proxy(_ui.m_List.GetChildAt(itemCfg - 1));
             if (item.m_RewardBtn.m_c1.selectedIndex == 1)
             {
-                bool result = await ActivitySProxy.ReqActivityZCJBReward(5006, itemCfg);
+                bool result = await ActivitySProxy.ReqActivityZCJBReward(ActivityDataManager.Instance.GetCurOpenActiveByType(17), zcjbCfgList[itemCfg - 1].id);
                 if (!result) return;
                 GetSuitItemController.TryShow(0);
                 EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBView.cs

@@ -41,8 +41,8 @@ namespace GFGGame
             _ui.m_btnChange.onClick.Add(this.Hide);
             _ui.m_shopBtn.onClick.Add(OnClickShopBtn);
 
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "zcjb_All");
-            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnEffect, "ui_Activity", "zcjb_icon");
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "WGSX_All_Tx/WGSX_All_Tx");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnEffect, "ui_Activity", "WGSX_Button/WGSX_Button");
         }                
         protected override void OnShown()
         {
@@ -98,7 +98,7 @@ namespace GFGGame
         }
         private async void ReqInfo()
         {
-            await ActivitySProxy.SetOnceStatus(5006, 1, 1);
+            await ActivitySProxy.SetOnceStatus(ActivityDataManager.Instance.activityZCJBId, 1, 1);
             bool result = await ActivitySProxy.ReqActivityZCJBInfo();
             if (!result) return;
         }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

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

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

@@ -511,7 +511,7 @@ namespace GFGGame
         {
             _currentList2 = null;
             currentListType = DressUpListType.List1;
-            if (this.viewData != null &&(int)this.viewData != 2)
+            if (this.viewData == null || (int)this.viewData != 2)
             {
                 _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length;
             }

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

@@ -765,11 +765,12 @@ namespace GFGGame
                 .SetLeftButton(true, "否").SetRightButton(true, "是", async (object data) =>
                 {
                     ViewManager.Show<ModalStatusView>("上传中...");
-                    await MatchingCompetitionSproxy.ReqMatchingCompetitionInfo();
+                    //await MatchingCompetitionSproxy.ReqMatchingCompetitionInfo();
                     object[] rsp = await MatchingCompetitionSproxy.UpLoadMatchingCompetitionDressData();
                     if (rsp == null) return;
                     byte[] bytes = tex.EncodeToJPG();
-                    if(rsp[0] == null)
+                    MatchingCompetitionDataManager.Instance.MyNtextture = new NTexture(tex);
+                    if (rsp[0] == null)
                     {
                         ViewManager.Hide<ModalStatusView>();
                         PromptController.Instance.ShowFloatTextPrompt("网络异常，上传失败!");

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()
         {
@@ -670,7 +677,20 @@ namespace GFGGame
                 }
                 else
                 {
-                    _ui.m_btnWeeklyGift.target.visible = true;
+                    ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.GetCurOpenActiveByType(101));
+                    int giftShopId = activityCfg.paramsArr[0];
+                    ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(giftShopId);
+                    var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+                    if (remainBuyNum == 0)
+                    {
+                        //已售完
+                        _ui.m_btnWeeklyGift.target.visible = false;
+                    }
+                    else
+                    {
+                        //未售完
+                        _ui.m_btnWeeklyGift.target.visible = true;
+                    }
                 }
             }
         }
@@ -754,6 +774,11 @@ namespace GFGGame
                 //long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
                 //_ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
+            ActivityOpenCfg zcjbCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.GetCurOpenActiveByType(17));
+            if(zcjbCfg != null)
+            {
+                _ui.m_btnActivityZCJB.m_iconMain.url = ResPathUtil.GetActivityPath(zcjbCfg.res, "png");
+            }  
         }
 
         private void UpdateOpenServerActivity()
@@ -1099,6 +1124,7 @@ namespace GFGGame
             _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
             UpdateSevenIcon();
 
+            _btnPoem.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name, false);
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);

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

@@ -176,8 +176,17 @@ namespace GFGGame
         {
             UI_MatchingDressItem item = UI_MatchingDressItem.Proxy(obj);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(IdList[index]);
-            item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.res, "png");
-            item.m_txtTitle.text = itemCfg.name;
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(IdList[index]);
+            if (itemCfg != null)
+            {
+                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.res, "png");
+                item.m_txtTitle.text = itemCfg.name;
+            }
+            else if (suitCfg != null)
+            {
+                item.m_icon.url = ResPathUtil.GetIconPath(suitCfg.res, "png");
+                item.m_txtTitle.text = suitCfg.name;
+            }
             UI_MatchingDressItem.ProxyEnd();
         }
         private void OnClickListType1Item(EventContext context)
@@ -187,7 +196,18 @@ namespace GFGGame
             IdList.Clear();
             foreach (var idItem in AllIdList)
             {
-                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(idItem);
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(idItem);
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(idItem);
+                if(itemCfg == null && suitCfg == null)
+                {
+                        continue;                  
+                }
+                else if(itemCfg != null)
+                {
+                    if (idItem == 10000 || idItem == 20000 || idItem == 30000 || idItem == 50000 || idItem == 60000)
+                    {
+                        continue;
+                    }
                     if (index.type != 0)
                     {
                         if (itemCfg.subType == index.type)
@@ -197,14 +217,19 @@ namespace GFGGame
                     }
                     else
                     {
-                        foreach(var itemSubMenus in index.subMenusArr)
+                        foreach (var itemSubMenus in index.subMenusArr)
                         {
-                            if(DressUpMenuItemCfg2Array.Instance.dataArray[(itemSubMenus -1)].type == itemCfg.subType)
+                            if (DressUpMenuItemCfg2Array.Instance.dataArray[(itemSubMenus - 1)].type == itemCfg.subType)
                             {
                                 IdList.Add(idItem);
                             }
                         }
                     }
+                }
+                else if (index.type == 25 && suitCfg != null)
+                {
+                    IdList.Add(idItem);
+                }
             }
             _ui.m_dressList.numItems = IdList.Count;
             _ui.m_dressList.visible = true;

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

@@ -50,11 +50,17 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateView);
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_c1.selectedIndex = 1;
             JudgingRoundOpenCfg judgingCfg = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1];
             SuitID = judgingCfg.ShowSuit;
@@ -67,7 +73,6 @@ namespace GFGGame
 
         protected override void OnHide()
         {
-
             DressUpObjUI dressUpObjUI = _ui.m_suitShow.data as DressUpObjUI;
             if (dressUpObjUI != null)
             {
@@ -78,14 +83,11 @@ namespace GFGGame
             Timers.inst.Remove(UpdateTime);
         }
 
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-        }
         private void UpdateView()
         {
-            if (true)
+            if (MatchingCompetitionDataManager.Instance.MyNtextture == null)
             {
+                _ui.m_playerImage.texture = null;
                 DressUpObjUI dressUpObjUI;
                 if (_ui.m_suitShow.data == null)
                 {
@@ -97,16 +99,31 @@ namespace GFGGame
                 dressUpObjUI.dressUpObj.PutOnSuitCfg(SuitID, showAction, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
                 dressUpObjUI.UpdateWrapper(_ui.m_suitShow);
             }
+            else
+            {
+                DressUpObjUI dressUpObjUI = _ui.m_suitShow.data as DressUpObjUI;
+                if (dressUpObjUI != null)
+                {
+                    dressUpObjUI.Dispose();
+                }
+                _ui.m_suitShow.data = null;
+                _ui.m_playerImage.texture = MatchingCompetitionDataManager.Instance.MyNtextture;
+            }
         }
         private void UpdateTime(object param = null)
         {
             long endTime = MatchingCompetitionDataManager.Instance.MatchingEndTimes;
             long curTime = TimeHelper.ServerNow();
+            if (MatchingCompetitionDataManager.Instance.MatchingState != 1)
+            {
+                Timers.inst.Remove(UpdateTime);
+                PromptController.Instance.ShowFloatTextPrompt("投稿时间已到!");
+                ViewManager.GoBackFrom(typeof(MatchingCompetitionGatheringView).FullName);
+                return;
+            }
             if (endTime < curTime + 1)
             {
                 Timers.inst.Remove(UpdateTime);
-                //PromptController.Instance.ShowFloatTextPrompt("投稿时间已到!");
-                //ViewManager.GoBackFrom(typeof(MatchingCompetitionGatheringView).FullName);
                 return;
             }
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
@@ -120,18 +137,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/MatchingCompetitionLookView.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using ET;
+using FairyGUI;
+using UI.MatchingCompetition;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class MatchingCompetitionLookView : BaseWindow
+    {
+        private UI_MatchingCompetitionLookUI _ui;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MatchingCompetitionLookUI.PACKAGE_NAME;
+            _ui = UI_MatchingCompetitionLookUI.Create();
+            this.viewCom = _ui.target;
+            isReturnView = true;
+            isfullScreen = true;
+
+            _ui.m_BtnBack.onClick.Add(OnClickBtnBack);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
+            _ui.m_playerImage.texture = MatchingCompetitionDataManager.Instance.MyNtextture;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(MatchingCompetitionLookView).FullName);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionLookView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e8223ccf06ac74941ad032194f64ec27
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -39,7 +39,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             UpdateView();
             UpdateHead();

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

@@ -0,0 +1,229 @@
+using System.Collections;
+using UnityEngine;
+using UI.MatchingCompetition;
+using FairyGUI;
+using System.Collections.Generic;
+using System;
+
+namespace GFGGame
+{
+    public class MatchingCompetitionRewardView : BaseWindow
+    {
+        private UI_MatchingCompetitionRewardUI _ui;
+        private List<ItemData> _listItemDatas;
+
+        private Action onSuccess = null;
+
+        private List<EffectUI> _effects = new List<EffectUI>();
+
+        private const int maxHeight = 1030;
+
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        private int counTime = 0;  //定时器计数
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui = UI_MatchingCompetitionRewardUI.Create();
+            this.viewCom = _ui.target;
+            //this.viewCom.Center();
+            //this.modal = true;
+            //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            isfullScreen = true;
+
+            _ui.m_comList.m_listReward.itemRenderer = RenderListRewardItem;
+            _ui.m_mask.onClick.Add(this.Hide);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_mask.touchable = false;
+            if ((this.viewData as object[]).Length > 0)
+            {
+                _listItemDatas = (this.viewData as object[])[0] as List<ItemData>;
+                onSuccess = (this.viewData as object[])[1] as Action;
+            }
+            else
+            {
+                _listItemDatas = this.viewData as List<ItemData>;
+            }
+
+            List<ItemData> suitPart = new List<ItemData>(); ;
+            for (int i = _listItemDatas.Count - 1; i >= 0; i--)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_listItemDatas[i].id);
+                if (suitCfg != null)
+                {
+                    for (int j = 0; j < suitCfg.partsArr.Length; j++)
+                    {
+                        suitPart.Add(ItemUtil.createItemData(suitCfg.partsArr[j], _listItemDatas[i].num));
+                    }
+                    _listItemDatas.RemoveAt(i);
+                }
+            }
+            _listItemDatas.AddRange(suitPart);
+            //_ui.m_listReward.SetVirtual();  //有虚拟列表的时候，没有办法居中显示列表
+
+            _ui.m_downTipsText.visible = false;
+            _ui.m_comList.m_listReward.numItems = 0;
+            counTime = 0;
+            Timers.inst.Add(0.1f, 3, OnTimerUpdate, 1);
+            Timers.inst.Add(0.5f, 1, OnTimerClick);
+        }
+
+        private void OnTimerClick(object param)
+        {
+            _ui.m_mask.touchable = true;
+        }
+
+        private void OnTimerUpdate(object param)
+        {
+            counTime += 1;
+            if (counTime == 1)
+            {
+                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD_Text");
+                _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderBgCom, "ui_hd", "TC_Quad_ALL");
+            }
+            else if (counTime == 2)
+            {
+                _ui.m_comList.m_listReward.numItems = _listItemDatas.Count;
+
+                _ui.m_comList.m_listReward.ResizeToFit();
+                if (_ui.m_comList.m_listReward.height > maxHeight)
+                {
+                    _ui.m_comList.m_listReward.height = maxHeight;
+                }
+            }
+            else if (counTime == 3)
+            {
+                _ui.m_downTipsText.visible = true;
+                Timers.inst.Remove(OnTimerUpdate);
+            }
+        }
+
+        protected override void OnHide()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
+            Timers.inst.Remove(OnTimerUpdate);
+            Timers.inst.Remove(OnTimerClick);
+            _ui.m_mask.touchable = true;
+            for (int i = 0; i < _effects.Count; i++)
+            {
+                if (_effects[i] != null)
+                {
+                    EffectUIPool.Recycle(_effects[i]);
+                    _effects[i] = null;
+                }
+            }
+            _effects.Clear();
+
+            if (onSuccess != null)
+            {
+                onSuccess();
+            }
+            base.OnHide();
+            //_effects.Clear();
+            EventAgent.DispatchEvent(ConstMessage.REWARDVIEW_CLOTHER);
+            GetSuitItemController.TryShow(0);
+        }
+        private void RenderListRewardItem(int index, GObject obj)
+        {
+            // obj.data = _listItemDatas[index];
+            UI.CommonGame.UI_ComItem item = UI.CommonGame.UI_ComItem.Proxy(obj);
+            string name = "";
+            string iconRes = "";
+            string ext = "png";
+            int rarity = 0;
+            int id = 0;
+            bool isSuit = false;
+
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_listItemDatas[index].id);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_listItemDatas[index].id);
+
+            if (suitCfg != null)
+            {
+                name = suitCfg.name;
+                iconRes = suitCfg.res;
+                rarity = suitCfg.rarity;
+                id = suitCfg.id;
+                isSuit = true;
+            }
+            else
+            {
+                name = itemCfg.name;
+                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
+                iconRes = itemCfg.res;
+                id = itemCfg.id;
+                isSuit = false;
+                //if (itemCfg.itemType == ConstItemType.DRESS_UP)
+                rarity = itemCfg.rarity;
+            }
+
+            item.m_txtName.text = name;
+            // item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("{0}", _listItemDatas[index].num);
+            item.m_txtCount.text = string.Format("{0}", _listItemDatas[index].num);
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(iconRes, ext);
+            if (rarity > 0)
+            {
+                item.m_QualityType.selectedIndex = rarity - 1;
+            }
+            else
+            {
+                item.m_QualityType.selectedIndex = 0;
+            }
+
+            RarityIconController.UpdateRarityIcon(item.m_loaRarity, id, false, isSuit);
+
+            item.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
+            //特效("ui_ck", "ui_ck_zl");
+            int childIndex = _ui.m_comList.m_listReward.ItemIndexToChildIndex(index);
+            if (_effects.Count <= childIndex)
+            {
+                EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderReware, "ui_hd", "GXHD_WuPin", 120);
+                _effects.Add(_effectUI);
+            }
+
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnClickListReward);
+            }
+            item.target.data = _listItemDatas[index];
+            UI.CommonGame.UI_ComItem.ProxyEnd();
+        }
+
+        private void OnClickListReward(EventContext context)
+        {
+            if (this.ShowTips)
+            {
+                ItemData data = (context.sender as GObject).data as ItemData;
+                GoodsItemTipsController.ShowItemTips(data.id);
+            }
+        }
+
+        private bool _showTips = true;
+        /// <summary>
+        /// 是否展示物品详情，默认展示
+        /// </summary>
+        private bool ShowTips
+        {
+            get { return _showTips; }
+            set { _showTips = value; }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionRewardView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2006751c01500084daa70311f2396e6b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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()
@@ -57,18 +59,26 @@ namespace GFGGame
         {
             UI_MatchingCompetitionRewardItem item = UI_MatchingCompetitionRewardItem.Proxy(obj);
             JudgingRoundRewardCfg judginRewardCfg = JudgingRoundRewardCfgArray.Instance.dataArray[index];
-            item.m_rankIndex.text = judginRewardCfg.desc;
+            if (index < 10)
+            {
+                item.m_rankIndex.text = "第" + judginRewardCfg.desc + "名";
+            }
+            else
+            {
+                item.m_rankIndex.text = judginRewardCfg.desc;
+            }
             if (item.m_rewardList.data == null)
             {
                 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;

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

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using ET;
 using FairyGUI;
 using UI.MatchingCompetition;
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace GFGGame
 {
@@ -12,12 +14,25 @@ namespace GFGGame
         private UI_MatchingCompetitionSelectUI _ui;
         private int _seasonIndex = 0;
         private bool isRefresh = false;
+        private JudgingRoundOpenCfg judgingCfg;
+        private GameObject _sceneObjectLeft;
+        private GameObject _sceneObjectRight;
         public override void Dispose()
         {
             if (_ui != null)
             {
                 _ui.Dispose();
             }
+            if (_sceneObjectLeft != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObjectLeft);
+                _sceneObjectLeft = null;
+            }
+            if (_sceneObjectRight != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObjectRight);
+                _sceneObjectRight = null;
+            }
             _ui = null;
             base.Dispose();
         }
@@ -39,48 +54,227 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_BtnBack.touchable = true;
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
-            //isRefresh = (bool)this.viewData;
+            //isRefresh = (bool)this.viewData;       
+            judgingCfg = JudgingRoundOpenCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason);
             UpdateView();
             UpdatePlayer();
+            //UpdateDressLeft();
+            ViewManager.Hide<ModalStatusView>();
         }
 
         protected override void OnHide()
         {
+            if (_sceneObjectLeft != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObjectLeft);
+                _sceneObjectLeft = null;
+            }
+            if (_sceneObjectRight != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObjectRight);
+                _sceneObjectRight = null;
+            }
             base.OnHide();
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH, UpdatePlayer);
+            //EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateDressLeft);
+            EventAgent.AddEventListener(ConstMessage.REWARDVIEW_CLOTHER, ShowReward);
         }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdatePlayer);
+            //EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateDressLeft);
+            EventAgent.RemoveEventListener(ConstMessage.REWARDVIEW_CLOTHER, ShowReward);
+        }
+        private void ShowReward()
+        {
+            if(MatchingCompetitionDataManager.Instance.SpecialBonusList != null && MatchingCompetitionDataManager.Instance.SpecialBonusList.Count > 0)
+            {
+                ViewManager.Show<MatchingCompetitionRewardView>(new object[] { ItemUtil.CreateItemDataList(MatchingCompetitionDataManager.Instance.SpecialBonusList),null});
+                MatchingCompetitionDataManager.Instance.SpecialBonusList = null;
+            }
+        }
+        private async void UpdateDressLeft()
+        {
+            //ViewManager.Show<ModalStatusView>("获取搭配数据中...");
+            MatchingLeftDataManager.Instance.itemGameObjs.Clear();
+            MatchingRightDataManager.Instance.itemGameObjs.Clear();
+            PhotographDataManager.Instance.itemGameObjs.Clear();
+            PhotographDataManager.Instance.dressUpObj?.Dispose();
+            PhotographDataManager.Instance.dressUpObj = new DressUpObj();
+            if (_sceneObjectLeft == null)
+            {
+                _sceneObjectLeft = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("ScenePhotograph"));
+                // 创建render texture
+                renderTexureLeft = new RenderTexture((int)_ui.m_playerShow1.target.width, (int)_ui.m_playerShow2.target.height, 24);
+
+                // 换装父节点 + 相机            
+                Camera camera = _sceneObjectLeft.transform.Find("Camera").GetComponent<Camera>();
+                camera.gameObject.SetActive(true);
+                camera.targetTexture = renderTexureLeft;
+                // 创建RawImg
+                
+            }
+
+            PhotographSceneManager.Instance.sceneObject = _sceneObjectLeft;
+            if (MatchingLeftDataManager.Instance.DressUpBgID == 0)
+            {
+                PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(180001));
+            }
+            else
+            {
+                PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(MatchingLeftDataManager.Instance.DressUpBgID));
+            }
+            PhotographSceneManager.Instance.AddBodyItem(1);
+            GameObject bodyParent = _sceneObjectLeft.transform.Find("Scene/Role").gameObject;
+            PhotographDataManager.Instance.dressUpObj.setSceneObj(_sceneObjectLeft, false, true, bodyParent, false, null);
+            PhotographDataManager.Instance.dressUpObj.PutOnDressUpData(MatchingLeftDataManager.Instance.MathingDressDate);
+
+            //对搭配赛特殊处理
+            for (int i = 0; i < MatchingLeftDataManager.Instance.DressPropIdList.Count; i++)
+            {
+                if (MatchingLeftDataManager.Instance.DressPropIdList[i] <= 0)
+                {
+                    continue;
+                }
+                else
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingLeftDataManager.Instance.DressPropIdList[i]);
+                    MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg, true,1);
+                }
+            }
+            await Task.Delay(200);
+            MatchingLeftDataManager.Instance.InsertGameObjectList();
+            for (int i = 0; i < MatchingLeftDataManager.Instance.TransformDataList.Count; i++)
+            {
+                TransformData itemdata = MatchingLeftDataManager.Instance.TransformDataList[i];
+                GameObject itemGObj = MatchingLeftDataManager.Instance.itemGameObjs[i];
+                MatchingLeftDataManager.Instance.itemGameObjs[i].transform.position = itemdata.position;
+                if (MatchingLeftDataManager.Instance.itemGameObjs[i].name == "Role")
+                {
+                    if (itemdata.position.y >= -5 || itemdata.position.y <= 5)
+                    {
+                        MatchingLeftDataManager.Instance.itemGameObjs[i].transform.position = new Vector3(itemdata.position.x, 0, 0);
+                    }
+                    if (itemdata.position.x >= -5 || itemdata.position.x <= 5)
+                    {
+                        MatchingLeftDataManager.Instance.itemGameObjs[i].transform.position = new Vector3(0, MatchingLeftDataManager.Instance.itemGameObjs[i].transform.position.y, 0);
+                    }
+                }
+                MatchingLeftDataManager.Instance.itemGameObjs[i].transform.Rotate(itemGObj.transform.eulerAngles.x, itemGObj.transform.eulerAngles.y, itemdata.rotationZ);
+                MatchingLeftDataManager.Instance.itemGameObjs[i].transform.localScale = itemdata.scale;
+                PhotographUtil.Instance.ChangeLayer(MatchingLeftDataManager.Instance.itemGameObjs[i], i * PhotographDataManager.layerCount, "up");
+            }
+            PhotographUtil.Instance.ChangeLayer(MatchingLeftDataManager.Instance.roleGameobj, 2 * PhotographDataManager.layerCount, "up");
+            await Task.Delay(50);
+            UpdateDressRigh();
         }
+        private async void UpdateDressRigh()
+        {
+            MatchingRightDataManager.Instance.itemGameObjs.Clear();
+            PhotographDataManager.Instance.itemGameObjs.Clear();
+            PhotographDataManager.Instance.dressUpObj?.Dispose();
+            PhotographDataManager.Instance.dressUpObj = new DressUpObj();
+            if (_sceneObjectRight == null)
+            {
+                _sceneObjectRight = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("ScenePhotograph"));
+                // 创建render texture
+                renderTexureRight = new RenderTexture((int)_ui.m_playerShow1.target.width, (int)_ui.m_playerShow2.target.height, 24);
+
+                // 换装父节点 + 相机            
+                Camera camera = _sceneObjectRight.transform.Find("Camera").GetComponent<Camera>();
+                camera.gameObject.SetActive(true);
+                camera.targetTexture = renderTexureRight;
+            }
+
+            PhotographSceneManager.Instance.sceneObject = _sceneObjectRight;
+            if (MatchingRightDataManager.Instance.DressUpBgID == 0)
+            {
+                PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(180004));
+            }
+            else
+            {
+                PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(MatchingRightDataManager.Instance.DressUpBgID));
+            }
+            PhotographSceneManager.Instance.AddBodyItem(2);
+            GameObject bodyParent = _sceneObjectRight.transform.Find("Scene/Role").gameObject;
+            PhotographDataManager.Instance.dressUpObj.setSceneObj(_sceneObjectRight, false, true, bodyParent, false, null);
+            PhotographDataManager.Instance.dressUpObj.PutOnDressUpData(MatchingRightDataManager.Instance.MathingDressDate);
+
+            //对搭配赛特殊处理
+            for (int i = 0; i < MatchingRightDataManager.Instance.DressPropIdList.Count; i++)
+            {
+                if (MatchingRightDataManager.Instance.DressPropIdList[i] <= 0)
+                {
+                    continue;
+                }
+                else
+                {
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingRightDataManager.Instance.DressPropIdList[i]);
+                    MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg, true,2);
+                }
+            }
+            await Task.Delay(200);
+            MatchingRightDataManager.Instance.InsertGameObjectList();
+            for (int i = 0; i < MatchingRightDataManager.Instance.TransformDataList.Count; i++)
+            {
+                TransformData itemdata = MatchingRightDataManager.Instance.TransformDataList[i];
+                GameObject itemGObj = MatchingRightDataManager.Instance.itemGameObjs[i];
+                MatchingRightDataManager.Instance.itemGameObjs[i].transform.position = itemdata.position;
+                if (MatchingRightDataManager.Instance.itemGameObjs[i].name == "Role")
+                {
+                    if (itemdata.position.y >= -5 || itemdata.position.y <= 5)
+                    {
+                        MatchingRightDataManager.Instance.itemGameObjs[i].transform.position = new Vector3(itemdata.position.x, 0, 0);
+                    }
+                    if (itemdata.position.x >= -5 || itemdata.position.x <= 5)
+                    {
+                        MatchingRightDataManager.Instance.itemGameObjs[i].transform.position = new Vector3(0, MatchingRightDataManager.Instance.itemGameObjs[i].transform.position.y, 0);
+                    }
+                }
+                MatchingRightDataManager.Instance.itemGameObjs[i].transform.Rotate(itemGObj.transform.eulerAngles.x, itemGObj.transform.eulerAngles.y, itemdata.rotationZ);
+                MatchingRightDataManager.Instance.itemGameObjs[i].transform.localScale = itemdata.scale;
+                PhotographUtil.Instance.ChangeLayer(MatchingRightDataManager.Instance.itemGameObjs[i], i * PhotographDataManager.layerCount, "up");
+            }
+            PhotographUtil.Instance.ChangeLayer(MatchingRightDataManager.Instance.roleGameobj, 2 * PhotographDataManager.layerCount, "up");
+            await Task.Delay(50);
+            _sceneObjectRight.transform.position = new Vector3(50, 50, 50);
+            UpdatePlayer();
+        }
+        private RenderTexture renderTexureLeft;
+        private RenderTexture renderTexureRight;
         private void UpdatePlayer()
         {
-            _ui.m_playerShow1.m_playerImage.m_playerImage.texture = MatchingTwoDataManager.Instance.LeftRoleInfo.Ntexture;
-            _ui.m_playerShow2.m_playerImage.m_playerImage.texture = MatchingTwoDataManager.Instance.RightRoleInfo.Ntexture;
-            MatchingPhotoWorksData otherLeftdata = MatchingTwoDataManager.Instance.LeftRoleInfo;
+            //_ui.m_playerShow1.m_playerImage.m_playerImage.texture = new NTexture(renderTexureLeft);
+            //_ui.m_playerShow2.m_playerImage.m_playerImage.texture = new NTexture(renderTexureRight);
+            _ui.m_playerShow1.m_playerImage.m_playerImage.texture = MatchingLeftDataManager.Instance.LeftRoleInfo.Ntexture;
+            _ui.m_playerShow2.m_playerImage.m_playerImage.texture = MatchingRightDataManager.Instance.RightRoleInfo.Ntexture;
+            MatchingPhotoWorksData otherLeftdata = MatchingLeftDataManager.Instance.LeftRoleInfo;
             JudgingRoundRoleInfo otherLeftInfo = otherLeftdata.JudgingInfo;
             RoleInfoManager.Instance.UpdateHead(_ui.m_player1.m_head, otherLeftInfo.HeadItemId, otherLeftInfo.HeadBorderItemId);
             _ui.m_player1.m_nameText.text = otherLeftInfo.RoleName.ToString();
+            _ui.m_select1.m_numText.visible = false;
             _ui.m_select1.m_numText.text = otherLeftInfo.Score.ToString();
-            MatchingPhotoWorksData otherRightdata = MatchingTwoDataManager.Instance.RightRoleInfo;
+            MatchingPhotoWorksData otherRightdata = MatchingRightDataManager.Instance.RightRoleInfo;
             JudgingRoundRoleInfo otherRightInfo = otherRightdata.JudgingInfo;
             RoleInfoManager.Instance.UpdateHead(_ui.m_player2.m_head, otherRightInfo.HeadItemId, otherRightInfo.HeadBorderItemId);
             _ui.m_player2.m_nameText.text = otherRightInfo.RoleName.ToString();
+            _ui.m_select2.m_numText.visible = false;
             _ui.m_select2.m_numText.text = otherRightInfo.Score.ToString();
+            ViewManager.Hide<ModalStatusView>();
         }
         private void UpdateView()
         {
             _ui.m_selectText1.alpha = 0;
             _ui.m_selectText2.alpha = 0;
-            _ui.m_timeText.text = string.Format("剩余次数：{0}", MatchingCompetitionDataManager.Instance.MatchingRemainingTimes);
+            _ui.m_timeText.text = string.Format("剩余次数：{0}",Mathf.Max(0, judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes));
         }
         private void OnClickBtnBack()
         {
@@ -89,42 +283,79 @@ namespace GFGGame
         }
         private async void OnClickBtnSelect1()
         {
-            if(MatchingCompetitionDataManager.Instance.MatchingRemainingTimes<=0)
+            if((judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes)<=0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("评选次数不足");
                 return;
             }
             bool result = await MatchingCompetitionSproxy.ReqCheckMatchingCompetitionWork(
-                MatchingTwoDataManager.Instance.LeftRoleInfo.JudgingInfo.WorksId,MatchingTwoDataManager.Instance.RightRoleInfo.JudgingInfo.WorksId
+                MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo.WorksId,MatchingRightDataManager.Instance.RightRoleInfo.JudgingInfo.WorksId
                 ) ;
             if(result)
             {
                 _ui.m_select1.m_c1.selectedIndex = 1;
-                _ui.m_select1.m_numText.text = string.Format("心动值{0}", MatchingTwoDataManager.Instance.LeftRoleInfo.JudgingInfo.Score.ToString());
-                _ui.m_timeText.text = string.Format("剩余次数：{0}", MatchingCompetitionDataManager.Instance.MatchingRemainingTimes);
-                _ui.m_BtnBack.touchable = false;
-                _ui.m_t0.Play(() => OnClickBtnBack());
+                _ui.m_select1.m_numText.visible = true;
+                _ui.m_select2.m_numText.visible = true;
+                _ui.m_select1.m_numText.text = string.Format("心动值{0}", MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo.Score.ToString());
+                _ui.m_timeText.text = string.Format("剩余次数：{0}", Mathf.Max(0, judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes));
             }
-
+            _ui.m_t0.Play(async () =>
+            {
+                bool resulst = await MatchingCompetitionSproxy.ReqGetTwoPlayers();
+                if (resulst)
+                {
+                    if (_sceneObjectLeft != null)
+                    {
+                        PrefabManager.Instance.Restore(_sceneObjectLeft);
+                        _sceneObjectLeft = null;
+                    }
+                    if (_sceneObjectRight != null)
+                    {
+                        PrefabManager.Instance.Restore(_sceneObjectRight);
+                        _sceneObjectRight = null;
+                    }
+                    //UpdateDressLeft();
+                    UpdateView();
+                }
+            });
         }
         private async void OnClickBtnSelect2()
         {
-            if (MatchingCompetitionDataManager.Instance.MatchingRemainingTimes <= 0)
+            if ((judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes) <= 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("评选次数不足");
                 return;
             }
             bool result = await MatchingCompetitionSproxy.ReqCheckMatchingCompetitionWork(
-                            MatchingTwoDataManager.Instance.RightRoleInfo.JudgingInfo.WorksId, MatchingTwoDataManager.Instance.LeftRoleInfo.JudgingInfo.WorksId
+                            MatchingRightDataManager.Instance.RightRoleInfo.JudgingInfo.WorksId, MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo.WorksId
                             );
             if (result)
             {
                 _ui.m_select2.m_c1.selectedIndex = 1;
-                _ui.m_select2.m_numText.text = string.Format("心动值{0}", MatchingTwoDataManager.Instance.RightRoleInfo.JudgingInfo.Score.ToString());
-                _ui.m_timeText.text = string.Format("剩余次数：{0}", MatchingCompetitionDataManager.Instance.MatchingRemainingTimes);
-                _ui.m_BtnBack.touchable = false;
-                _ui.m_t1.Play(() => OnClickBtnBack());
+                _ui.m_select1.m_numText.visible = true;
+                _ui.m_select2.m_numText.visible = true;
+                _ui.m_select2.m_numText.text = string.Format("心动值{0}", MatchingRightDataManager.Instance.RightRoleInfo.JudgingInfo.Score.ToString());
+                _ui.m_timeText.text = string.Format("剩余次数：{0}", Mathf.Max(0, judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes));
             }
+            _ui.m_t1.Play(async () => 
+            {
+                bool resulst = await MatchingCompetitionSproxy.ReqGetTwoPlayers();
+                if (resulst)
+                {
+                    if (_sceneObjectLeft != null)
+                    {
+                        PrefabManager.Instance.Restore(_sceneObjectLeft);
+                        _sceneObjectLeft = null;
+                    }
+                    if (_sceneObjectRight != null)
+                    {
+                        PrefabManager.Instance.Restore(_sceneObjectRight);
+                        _sceneObjectRight = null;
+                    }
+                    //UpdateDressLeft();
+                    UpdateView();
+                }
+            });
         }
     }
 }

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

@@ -46,12 +46,13 @@ namespace GFGGame
             _ui.m_btnRank.onClick.Add(OnClickBtnRank);
             _ui.m_btnLook.onClick.Add(OnClickBtnLook);
             _ui.m_btnExchage.onClick.Add(OnClickBtnExchange);
+            _ui.m_beforeWork.onClick.Add(OnClickBtnBeforeWorks);
             _ui.m_ruleBtn.onClick.Add(MatchingCompetitionDataManager.Instance.OnClickBtnRule);
         }
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_c1.selectedIndex = MatchingCompetitionDataManager.Instance.MatchingState;
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             isCountTime = false;
@@ -84,7 +85,8 @@ namespace GFGGame
         }
         private async void UpdateDress()
         {
-            if (MatchingOneDataManager.Instance.MathingDressDate.actionId != 0)
+            //if (MatchingOneDataManager.Instance.MathingDressDate.actionId != 0)
+            if(false)
             {
                 _ui.m_bg.visible = false;
                 _ui.m_playerImage.visible = false;
@@ -113,27 +115,39 @@ namespace GFGGame
                 //对搭配赛特殊处理
                 for (int i = 0; i < MatchingOneDataManager.Instance.DressPropIdList.Count; i++)
                 {
-                    if (MatchingOneDataManager.Instance.DressPropIdList[i] == MatchingOneDataManager.Instance.roleID)
+                    if (MatchingOneDataManager.Instance.DressPropIdList[i] <= 0 )
                     {
                         continue;
                     }
                     else
                     {
-                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.DressPropIdList[i]);
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingOneDataManager.Instance.DressPropIdList[i]);
                         MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg, true);
                     }
                 }
-                await Task.Delay(100);
+                await Task.Delay(200);
                 MatchingOneDataManager.Instance.InsertGameObjectList();
                 for (int i = 0; i < MatchingOneDataManager.Instance.TransformDataList.Count; i++)
                 {
                     TransformData itemdata = MatchingOneDataManager.Instance.TransformDataList[i];
                     GameObject itemGObj = MatchingOneDataManager.Instance.itemGameObjs[i];
                     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);
+                        }
+                    }
                     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 * PhotographDataManager.layerCount, "up");
+                    PhotographUtil.Instance.ChangeLayer(MatchingOneDataManager.Instance.itemGameObjs[i], (i+1) * PhotographDataManager.layerCount, "up");
                 }
+                PhotographUtil.Instance.ChangeLayer(MatchingOneDataManager.Instance.roleGameobj, 2 * PhotographDataManager.layerCount, "up");
             }
             else
             {
@@ -146,26 +160,25 @@ namespace GFGGame
         {
             _ui.m_countTime.fillAmount = 0;
             _ui.m_countTime.visible = false;
-            long endTime = MatchingCompetitionDataManager.Instance.MatchingEndTimes;
-            long curTime = TimeHelper.ServerNow();
-            if (endTime < curTime + 1)
-            {
-                if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
-                {
-                    PromptController.Instance.ShowFloatTextPrompt("评选时间已到!");
-                    ViewManager.GoBackFrom(typeof(MatchingCompetitionUpLoadView).FullName);
-                }
-                return;
-            }
-            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-            if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
-            {
-                _ui.m_timeText.text = "评选剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
-            }
-            else
-            {
-                _ui.m_timeText.text = "结算剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
-            }
+            //long endTime = MatchingCompetitionDataManager.Instance.MatchingEndTimes;
+            //long curTime = TimeHelper.ServerNow();
+            //if (endTime < curTime + 1)
+            //{
+            //    if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
+            //    {
+            //        PromptController.Instance.ShowFloatTextPrompt("评选时间已到!");
+            //    }
+            //    return;
+            //}
+            //TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
+            //if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
+            //{
+            //    _ui.m_timeText.text = "评选剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            //}
+            //else
+            //{
+            //    _ui.m_timeText.text = "结算剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            //}
         }
         private void UpdateHead()
         {
@@ -220,6 +233,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("结算期间无法选择!");
                 return;
             }
+            if(MatchingCompetitionDataManager.Instance.MatchingRemainingTimes <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("评选次数不足!");
+                return;
+            }
             //先获取两个玩家信息
             bool resulst =  await MatchingCompetitionSproxy.ReqGetTwoPlayers();
             if(resulst)
@@ -229,10 +247,14 @@ namespace GFGGame
         }
         private void OnClickBtnShop()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, 3 });
         }
         private void OnClickBtnMyWorks()
         {
+            ViewManager.Show<MatchingCompetitionLookView>();
+        }
+        private void OnClickBtnBeforeWorks()
+        {
             ViewManager.Show<PoemPhotoView>(2);
         }
         private async void OnClickBtnRank()
@@ -258,16 +280,21 @@ namespace GFGGame
             _ui.m_countTime.visible = true;
             _ui.m_countTime.fillAmount = 1.0f;
             Timers.inst.AddUpdate(UpdateCountTime);
-            ViewManager.Show<ModalStatusView>("刷新中...");
+            //ViewManager.Show<ModalStatusView>("刷新中...");
             bool result = await MatchingCompetitionSproxy.ReqGetOnePlayers();
             if (result)
             {
+                if (_sceneObject != null)
+                {
+                    PrefabManager.Instance.Restore(_sceneObject);
+                    _sceneObject = null;
+                }
                 //UpdateView();
                 UpdateHead();
                 UpdateDress();
-                ViewManager.Hide<ModalStatusView>();
+                //ViewManager.Hide<ModalStatusView>();
             }
-            ViewManager.Hide<ModalStatusView>();
+            //ViewManager.Hide<ModalStatusView>();
         }
         private void OnClickBtnLook()
         {

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

@@ -36,11 +36,17 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateView);
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             _seasonIndex = (int)this.viewData;
             UpdateView();
@@ -51,10 +57,6 @@ namespace GFGGame
             base.OnHide();
         }
 
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-        }
         private void UpdateView()
         {
             _ui.m_workList.numItems = MatchingCompetitionDataManager.Instance._BeforeRankList.Count;
@@ -76,6 +78,7 @@ namespace GFGGame
             RoleInfoManager.Instance.UpdateHead(item.m_head, otherInfo.HeadItemId, otherInfo.HeadBorderItemId);
             item.m_nameText.text = otherInfo.RoleName.ToString();
             item.m_countText.text = otherInfo.Score.ToString();
+            item.m_playerImage.texture = otherdata.Ntexture;
             if (item.target.data == null)
             {
                 item.target.onClick.Add(OnClickBtnItem);

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

@@ -36,11 +36,17 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateView);
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             UpdateView();
         }
@@ -49,11 +55,6 @@ namespace GFGGame
         {
             base.OnHide();
         }
-
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-        }
         private void UpdateView()
         {
             _ui.m_worksList.numItems = MatchingCompetitionDataManager.Instance._BeforeWorksList.Count;
@@ -61,6 +62,12 @@ namespace GFGGame
         private void RenderRankList(int index, GObject obj)
         {
             UI_Component5 item = UI_Component5.Proxy(obj);
+            JudgingRoundOpenCfg judingCfg = JudgingRoundOpenCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance._BeforeWorksList[index].WorksInfo.OldJudgingRoundOpenId);
+            item.m_seasonText.text = string.Format("第{0}期",MatchingCompetitionDataManager.Instance._BeforeWorksList[index].WorksInfo.OldJudgingRoundOpenId.ToString());
+            item.m_seasonName.text = judingCfg.Name;
+            item.m_openTime.visible = false;
+            //string themeTime = TimeUtil.FormattingTimeTo_yyyMMdd2(MatchingCompetitionDataManager.Instance._BeforeWorksList[index]);
+            item.m_playerImage.texture = MatchingCompetitionDataManager.Instance._BeforeWorksList[index].Ntexture;
             if (item.target.data == null)
             {
                 item.target.onClick.Add(OnClickBtnItem);

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -213,6 +213,10 @@ namespace GFGGame
                         item.visible = true;
                     }
                 }
+                else
+                {
+                    item.visible = true;
+                }
                 item.title = _storeTabCfgs[index][0];
                 menu2 = int.Parse(_storeTabCfgs[index][1]);
             }

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -70,7 +70,7 @@ namespace GFGGame
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.LOCAL;
-            cfgName = "cfg_dev";
+            cfgName = "cfg_dev19";
             ChannelId = (int)ChannelID.Test;
 #elif PT_DouYouDev
             netType = EnumNetType.LOCAL;

GameClient/Assets/Plugins/Android/AndroidManifest.xml

@@ -18,7 +18,7 @@
     <application
         android:allowBackup="true"
 		android:icon="@drawable/ic_launcher"
-		android:label="万世镜local">
+		android:label="万世镜Dev">
 		<activity android:name="com.unity3d.player.UnityPlayerActivity"
             android:configChanges="mnc|keyboardHidden|screenSize|orientation|keyboard"
             android:screenOrientation="portrait"

GameClient/Assets/ResIn/Prefab/ScenePhotograph.prefab

@@ -1,5 +1,84 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1676607243667215494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6674501151243515770}
+  - component: {fileID: 3400994236161160953}
+  m_Layer: 0
+  m_Name: Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6674501151243515770
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1676607243667215494}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -5.49}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8933042271082668914}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -0.5, y: 2.3}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!20 &3400994236161160953
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1676607243667215494}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: -1
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 9.6
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 23
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 0
+  m_HDR: 1
+  m_AllowMSAA: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 0
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
 --- !u!1 &3726009262938659745
 GameObject:
   m_ObjectHideFlags: 0
@@ -29,7 +108,7 @@ Transform:
   m_Children:
   - {fileID: 2394733109435034269}
   m_Father: {fileID: 8933042271082668914}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4573956036435348681
 GameObject:
@@ -225,7 +304,7 @@ Transform:
   - {fileID: 177624320223164717}
   - {fileID: 1387909070457341848}
   m_Father: {fileID: 8933042271082668914}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6507681665420882922
 GameObject:
@@ -317,7 +396,7 @@ Transform:
   m_Children:
   - {fileID: 8924633051995509692}
   m_Father: {fileID: 8933042271082668914}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8933042271082668915
 GameObject:
@@ -346,6 +425,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 6674501151243515770}
   - {fileID: 7675319647472965112}
   - {fileID: 5810125597218964383}
   - {fileID: 7620177300938337219}

GameClient/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_2!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 473a5e7e81f0fe44fa22ecbb568a902e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_2.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 240eadbef17bebf4e915982f41b5eb00
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: