Merge remote-tracking branch 'remotes/origin/master' into ios_test

# Conflicts:
#	.gitattributes

.gitignore

@@ -47,6 +47,9 @@
 GameClient/Assets/Samples/
 GameClient/Assets/Samples.meta
 /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/Game/HotUpdate/Constant/ConstMessage.cs

@@ -258,5 +258,9 @@ namespace GFGGame
         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,7 @@ namespace GFGGame
             FightDataManager.Instance.Clear();
             MainDataManager.Instance.Clear();
             NewYearRedEnvelopeDataManager.Instance.Clear();
+            MatchingCompetitionDataManager.Instance.MyNtextture = null;
             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)
                         {
@@ -326,7 +335,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)
@@ -476,17 +492,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
                         {
@@ -523,7 +549,14 @@ namespace GFGGame
             }
             else
             {
-                itemGameObjs.Insert(indexRoleData, roleGameobj);
+                if (indexRoleData > itemGameObjs.Count)
+                {
+                    itemGameObjs.Add(roleGameobj);
+                }
+                else
+                {
+                    itemGameObjs.Insert(indexRoleData, roleGameobj);
+                }
             }
         }
     }

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

@@ -45,17 +45,27 @@ namespace GFGGame
                 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 == 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(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
                         {
@@ -92,7 +102,14 @@ namespace GFGGame
             }
             else
             {
-                itemGameObjs.Insert(indexRoleData, roleGameobj);
+                if(indexRoleData > itemGameObjs.Count)
+                {
+                    itemGameObjs.Add(roleGameobj);
+                }
+                else
+                {
+                    itemGameObjs.Insert(indexRoleData, roleGameobj);
+                } 
             }
         }
     }
@@ -132,17 +149,27 @@ namespace GFGGame
                 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 == 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(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
                         {
@@ -179,7 +206,14 @@ namespace GFGGame
             }
             else
             {
-                itemGameObjs.Insert(indexRoleData, roleGameobj);
+                if (indexRoleData > itemGameObjs.Count)
+                {
+                    itemGameObjs.Add(roleGameobj);
+                }
+                else
+                {
+                    itemGameObjs.Insert(indexRoleData, roleGameobj);
+                }
             }
         }
     }

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

@@ -58,12 +58,23 @@ 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);
@@ -71,8 +82,6 @@ namespace GFGGame
 
         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);
@@ -81,6 +90,11 @@ namespace GFGGame
             {
                 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/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_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

@@ -31,16 +31,21 @@ namespace GFGGame
             MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason = response.JudgingRoundOpenId;
             MatchingCompetitionDataManager.Instance.MatchingState = response.PhaseType;
             MatchingCompetitionDataManager.Instance.MatchingEndTimes = response.PhaseEndTime;
-            MatchingCompetitionDataManager.Instance.MatchingRemainingTimes = GameGlobal.myNumericComponent.GetAsInt(NumericType.JudgingRoundSelNum);
-            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;
         }
@@ -89,7 +94,7 @@ namespace GFGGame
                 WorksId = MatchingCompetitionDataManager.Instance.WorksID
             }) ;
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-
+            
             return true;
         }
 
@@ -102,7 +107,6 @@ namespace GFGGame
             {
                 return false;
             }
-            MatchingCompetitionDataManager.Instance.MatchingRemainingTimes = GameGlobal.myNumericComponent.GetAsInt(NumericType.JudgingRoundSelNum);
             MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[0];
             if(response.JudgingRoundRoleInfoList[0] != null)
             {
@@ -131,7 +135,8 @@ namespace GFGGame
             {
                 return false;
             }
-            MatchingCompetitionDataManager.Instance.MatchingRemainingTimes = GameGlobal.myNumericComponent.GetAsInt(NumericType.JudgingRoundSelNum);
+            MatchingCompetitionDataManager.Instance.MatchingRemainingTimes = response.Num;
+            MatchingCompetitionDataManager.Instance.SpecialBonusList = response.SpecialBonusList;
             if (MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo.WorksId == workID)
             {
                 MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo = response.JudgingRoundRoleInfoList[0];

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/MainUI/MainUIView.cs

@@ -677,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;
+                    }
                 }
             }
         }
@@ -761,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()
@@ -1106,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/MatchingCompetitionGatheringView.cs

@@ -50,6 +50,12 @@ 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()
         {
@@ -67,7 +73,6 @@ namespace GFGGame
 
         protected override void OnHide()
         {
-
             DressUpObjUI dressUpObjUI = _ui.m_suitShow.data as DressUpObjUI;
             if (dressUpObjUI != null)
             {
@@ -78,13 +83,9 @@ namespace GFGGame
             Timers.inst.Remove(UpdateTime);
         }
 
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-        }
         private void UpdateView()
         {
-            if (true)
+            if (MatchingCompetitionDataManager.Instance.MyNtextture == null)
             {
                 DressUpObjUI dressUpObjUI;
                 if (_ui.m_suitShow.data == null)
@@ -97,6 +98,16 @@ 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)
         {

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/MatchingCompetitionSelectView.cs

@@ -60,7 +60,8 @@ namespace GFGGame
             //isRefresh = (bool)this.viewData;       
             judgingCfg = JudgingRoundOpenCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason);
             UpdateView();
-            UpdateDressLeft();
+            UpdatePlayer();
+            //UpdateDressLeft();
             ViewManager.Hide<ModalStatusView>();
         }
 
@@ -81,19 +82,30 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            //EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH, UpdatePlayer);
+            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, 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)
+            {
+                BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(MatchingCompetitionDataManager.Instance.SpecialBonusList)); ;
+                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();
@@ -120,7 +132,7 @@ namespace GFGGame
             {
                 PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(MatchingLeftDataManager.Instance.DressUpBgID));
             }
-            PhotographSceneManager.Instance.AddBodyItem();
+            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);
@@ -135,21 +147,33 @@ namespace GFGGame
                 else
                 {
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingLeftDataManager.Instance.DressPropIdList[i]);
-                    ET.Log.Debug(string.Format("zyq:{0}", MatchingLeftDataManager.Instance.DressPropIdList[i]));
                     MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg, true,1);
                 }
             }
-            await Task.Delay(100);
+            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()
@@ -179,7 +203,7 @@ namespace GFGGame
             {
                 PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(MatchingRightDataManager.Instance.DressUpBgID));
             }
-            PhotographSceneManager.Instance.AddBodyItem();
+            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);
@@ -197,27 +221,41 @@ namespace GFGGame
                     MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg, true,2);
                 }
             }
-            await Task.Delay(100);
+            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);
-            await Task.Delay(100);
             UpdatePlayer();
         }
         private RenderTexture renderTexureLeft;
         private RenderTexture renderTexureRight;
         private void UpdatePlayer()
         {
-            _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 = 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);

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

@@ -46,6 +46,7 @@ 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()
@@ -85,6 +86,7 @@ namespace GFGGame
         private async void UpdateDress()
         {
             //if (MatchingOneDataManager.Instance.MathingDressDate.actionId != 0)
+            if(false)
             {
                 _ui.m_bg.visible = false;
                 _ui.m_playerImage.visible = false;
@@ -113,7 +115,7 @@ 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;
                     }
@@ -123,24 +125,36 @@ namespace GFGGame
                         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
+            {
+                _ui.m_bg.visible = true;
+                _ui.m_playerImage.visible = true;
+                _ui.m_playerImage.texture = MatchingOneDataManager.Instance.OneRoleInfo.Ntexture;
             }
-            //else
-            //{
-            //    _ui.m_bg.visible = true;
-            //    _ui.m_playerImage.visible = true;
-            //    _ui.m_playerImage.texture = MatchingOneDataManager.Instance.OneRoleInfo.Ntexture;
-            //}
         }
         private void UpdateView()
         {
@@ -228,10 +242,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()

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

@@ -36,6 +36,12 @@ 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()
         {
@@ -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,6 +36,12 @@ 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()
         {
@@ -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

@@ -72,7 +72,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;