搭配赛提交

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

@@ -0,0 +1,289 @@
+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 MatchingCompetitionDataManager : SingletonBase<MatchingCompetitionDataManager>
+    {
+        ////搭配赛标记
+        //public int type = 2;
+        //位置信息数据索引
+        public int indexRoleData = 0;
+        //人物位置信息
+        public TransformData roleTransFormData = new TransformData();
+        public GameObject roleGameobj;
+        //*********************搭配数据*********************************
+        //需要传输的数据：MathingDressDate，DressUpBgID，DressPropIdList，TransformDataList，
+        public DressUpData MathingDressDate = DressUpData.CreateDefault();
+        public int DressUpBgID = 0;
+        //道具数据,一一对应
+        //场景名字，自己搭配的数据
+        public List<string> DressPropNameList = new List<string>();
+        //道具id
+        public List<int> DressPropIdList = new List<int>();
+        //道具位置信息
+        public List<TransformData> TransformDataList = new List<TransformData>();
+
+        public List<GameObject> itemGameObjs = new List<GameObject>();
+        public List<int> _equipSceneData = new List<int>();//当前穿戴的场景数据(从套装获得)
+        //***************************************************************
+
+        public int MatchingCompetitionSeason = 1;
+        public int MatchingRemainingTimes = 1;
+        //本期排行榜数据
+        public List<MatchingPlayerData> _currentRankList = new List<MatchingPlayerData>() { new MatchingPlayerData()};
+        //往期排行榜数据
+        public Dictionary<int, MatchingPlayerData> _beforeRankDic = new Dictionary<int, MatchingPlayerData>();
+
+        //根据时间判断：1:集结期 2：评选期  3；结算期
+        public int CheckCompetitionState()
+        {
+            long currentTime = TimeHelper.ServerNow();
+            DateTime dateTime = DateTimeOffset.FromUnixTimeSeconds(currentTime).DateTime;
+            // 获取星期几
+            DayOfWeek dayOfWeek = dateTime.DayOfWeek;
+            int week = (int)dayOfWeek;
+            int hour = dateTime.Hour;
+            if(week == 0)
+            {
+                if(hour >= 21)
+                {
+                    return 3;
+                }
+                else
+                {
+                    return 2;
+                }
+            }
+            if(week <= 3 && week >= 1)
+            {
+                if(week == 3 && hour >= 5)
+                {
+                    return 2;
+                }
+                if(week == 1 && hour < 5)
+                {
+                    return 3;
+                }
+                return 1;
+            }
+            else if(week > 3 && week <= 6)
+            {
+                return 2;
+            }
+            return -1;
+        }
+        //存储道具信息
+        public void SetTransformData()
+        {
+            DressPropNameList.Clear();
+            TransformDataList.Clear();
+            for (int i =0;i<itemGameObjs.Count;i++)
+            { 
+                if(itemGameObjs[i].name == "Role")
+                {
+                    TransformData itemData = new TransformData();
+                    roleTransFormData.position = itemGameObjs[i].transform.position;
+                    roleTransFormData.rotationZ = itemGameObjs[i].transform.eulerAngles.z;
+                    roleTransFormData.scale = itemGameObjs[i].transform.localScale;
+                    TransformDataList.Add(roleTransFormData);
+                    DressPropNameList.Add(itemGameObjs[i].name);
+                }
+                else
+                {
+                    TransformData itemData = new TransformData();
+                    itemData.position = itemGameObjs[i].transform.position;
+                    itemData.rotationZ = itemGameObjs[i].transform.eulerAngles.z;
+                    itemData.scale = itemGameObjs[i].transform.localScale;
+                    TransformDataList.Add(itemData);
+                    DressPropNameList.Add(itemGameObjs[i].name);
+                }
+
+            }
+            SetNameToIdList();
+        }
+        //将名字转换成道具id
+        public void SetNameToIdList()
+        {
+            DressPropIdList.Clear();
+            int flog_id = 0;
+            for (int i = 0; i < DressPropNameList.Count; i++)
+            {
+                bool containsUnderscore = Regex.IsMatch(DressPropNameList[i], "_");
+                if(!containsUnderscore)
+                {
+                    indexRoleData = i;
+                }
+                else
+                {
+                    // 使用正则表达式分割字符串
+                    string[] parts = Regex.Split(DressPropNameList[i], "_");
+                    int partID = int.Parse(parts[0]);
+                    if(flog_id == 3 && int.Parse(parts[1]) == 1)
+                    {
+                        continue;
+                    }
+                    flog_id = int.Parse(parts[1]);   
+                    DressPropIdList.Add(partID);
+                }
+            }
+        }
+        //将穿戴数据分类
+        public void ClassifyEquipData()
+        {
+            _equipSceneData.Clear();
+            PhotographDataManager.Instance.dressUpObj = new DressUpObj();
+            //for (int i = 0; i < MathingDressDate.itemList.Count; i++)
+            //{
+            //    int itemId = MathingDressDate.itemList[i];
+            //    if (DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemId, false))
+            //    {
+            //        if (!_equipSceneData.ContainsKey(itemId))
+            //        {
+            //            _equipSceneData.Add(itemId, new List<int>());
+            //        }
+            //        _equipSceneData[itemId].Add(itemId);
+            //    }
+            //}
+            for(int i =0;i<DressPropIdList.Count;i++)
+            {
+                int itemId = DressPropIdList[i];
+                if (DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemId, false))
+                {
+                    _equipSceneData.Add(itemId);
+                }
+            }
+        }
+        public void InsertGameObjectList()
+        {
+            if(itemGameObjs.Count ==0)
+            {
+                itemGameObjs.Add(roleGameobj);
+            }
+            else
+            {
+                itemGameObjs.Insert(indexRoleData, roleGameobj);
+            }  
+        }
+        public void SetNumToRank(int index,UI_Component4 rankCom)
+        {
+            int c1 = 0;
+            int c2 = 0;
+            if(index<=3&& index >=1)
+            {
+                c2 = index;
+            }
+            if (index > 3 && index <= 9)
+            {
+                c1 = 0;
+            }
+            else if(index >9 && index <= 20)
+            {
+                c1 = 1;
+            }
+            else
+            {
+                c1 = 2;
+            }
+            rankCom.m_c1.selectedIndex = c1;
+            rankCom.m_c2.selectedIndex = c2;
+            if(c1 == 0)
+            {
+                rankCom.m_num3.url = string.Format("ui://MatchingCompetition/{0}",index.ToString());
+            }
+            else if(c1 == 1)
+            {
+                int one = index / 10;
+                int two = index % 10;
+                rankCom.m_num1.url = string.Format("ui://MatchingCompetition/{0}", one.ToString());
+                rankCom.m_num2.url = string.Format("ui://MatchingCompetition/{0}", two.ToString());
+            }
+            else
+            {
+                rankCom.m_RankText.text = index.ToString();
+            }
+
+        }
+        public async void AddSceneItem(ItemCfg itemCfg, bool setLayer)
+        {
+            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);
+                if (setLayer)
+                {
+                    if (parentGameObj3.transform.childCount > 0)
+                    {
+                        parentGameObj3.transform.localPosition = -parentGameObj3.transform.GetChild(0).localPosition;
+                        pos = parentGameObj3.transform.localPosition;
+                    }
+                }
+            }
+            if (!string.IsNullOrEmpty(itemCfg.resLayer2))
+            {
+                GameObject parentGameObj2 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 2));
+                await PhotographSceneManager.Instance.AddSceneItem(parentGameObj2, itemCfg, 2, setLayer);
+                if (setLayer)
+                {
+                    if (parentGameObj2.transform.childCount > 0)
+                    {
+                        parentGameObj2.transform.localPosition = pos == Vector3.zero ? -parentGameObj2.transform.GetChild(0).localPosition : pos;
+                        pos = parentGameObj2.transform.localPosition;
+                    }
+
+                }
+            }
+            if (!string.IsNullOrEmpty(itemCfg.resLayer1))
+            {
+
+                GameObject parentGameObj1 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 1));
+                await PhotographSceneManager.Instance.AddSceneItem(parentGameObj1, itemCfg, 1, setLayer);
+
+                if (setLayer)
+                {
+                    if (parentGameObj1.transform.childCount > 0)
+                    {
+                        parentGameObj1.transform.localPosition = pos == Vector3.zero ? -parentGameObj1.transform.GetChild(0).localPosition : pos;
+                        pos = parentGameObj1.transform.localPosition;
+                    }
+
+                }
+            }
+        }
+        public void OnClickBtnRule()
+        {
+            ViewManager.Show<MatchingCompetitionRuleTipsView>();
+        }
+    }
+
+    class OtherMatchingCompetitionDataManager : SingletonBase<OtherMatchingCompetitionDataManager>
+    {
+        //其他玩家信息用于展示
+        //人物位置信息
+        public TransformData roleTransFormData = new TransformData();
+        public GameObject roleGameobj;
+        //*********************搭配数据*********************************
+        //需要传输的数据：MathingDressDate，DressUpBgID，DressPropIdList，TransformDataList，
+        public DressUpData MathingDressDate = DressUpData.CreateDefault();
+        public int DressUpBgID = 0;
+        //道具数据,一一对应
+        //场景名字，自己搭配的数据
+        public List<string> DressPropNameList = new List<string>();
+        //道具id
+        public List<int> DressPropIdList = new List<int>();
+        //道具位置信息
+        public List<TransformData> TransformDataList = new List<TransformData>();
+
+        public List<GameObject> itemGameObjs = new List<GameObject>();
+        public List<int> _equipSceneData = new List<int>();//当前穿戴的场景数据
+        //***************************************************************
+    }
+}

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

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

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

@@ -10,6 +10,8 @@ namespace GFGGame
     {
         public List<ItemInfoProto> itemList = new List<ItemInfoProto>();
         public List<GameInfoProto> gameinfoList = new List<GameInfoProto>();
+        //记录合成游戏的矩阵信息
+        private List<List<int>> idList = new List<List<int>>();
 
         public bool CHECK_TIPS = false; //提示弹窗是否打开
 

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

@@ -62,12 +62,16 @@ namespace GFGGame
         public void AddBodyItem()
         {
             GameObject bodyParent = sceneObject.transform.Find("Scene/Role").gameObject;
+
+            MatchingCompetitionDataManager.Instance.roleGameobj = bodyParent;
+
             UpdatePhotographBody(sceneObject, bodyParent);
             AddItemGameObjectToList(bodyParent, false);
         }
 
         public async Task AddSceneItem(GameObject parentGameObj, ItemCfg itemCfg, int layer, bool setLayer, bool isOnlyEff = false)
         {
+            MatchingCompetitionDataManager.Instance.itemGameObjs.Add(parentGameObj);
 
             await AddItemToScene(sceneObject, parentGameObj, itemCfg.id, layer);
 

GameClient/Assets/Game/HotUpdate/Data/VO/MatchingCompetitionData.cs

@@ -0,0 +1,40 @@
+using ET;
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class MatchingPlayerData
+    {
+        public int roleID = 0;
+        public int HeadId = 0;
+        public int HeadBorderId = 0;
+        public string OtherPlayerName = "其他玩家";
+        public int Rank = 10;
+        //搭配数据
+        public int bgID = 0;
+        public int actionID = 0;
+        public List<int> DressIDList = new List<int>();
+        //搭配道具ID
+        public List<int> PropIDList = new List<int>();
+        //搭配道具位置信息
+        public List<string> DressTransformInfoList = new List<string>();
+        /// <summary>
+        /// 点赞投票次数
+        /// </summary>
+        public int OtherPlayerPopularity = 100;
+        /// <summary>
+        /// 作品资源
+        /// </summary>
+        public NTexture Ntexture = null;
+    }
+    //道具的位置信息
+    public class TransformData
+    {
+        public Vector3 position = new Vector3();
+        public float rotationZ = 0f;
+        public Vector3 scale = new Vector3();
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/VO/MatchingCompetitionData.cs.meta

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

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8ee0cb0210c41f54c93b13126104b2c0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Button3
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GTextField m_numText;
+        public const string URL = "ui://ri3cveycp3ft26";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Button3";
+        private static UI_Button3 _proxy;
+
+        public static UI_Button3 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button3();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button3();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_c1 = comp.GetController("c1");
+            m_numText = (GTextField)comp.GetChild("numText");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_numText = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Component1
+    {
+        public GComponent target;
+        public GComponent m_head;
+        public GTextField m_nameText;
+        public GTextField m_countText;
+        public const string URL = "ui://ri3cveycp3ft1e";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component1";
+        private static UI_Component1 _proxy;
+
+        public static UI_Component1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component1();
+            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_Component1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component1();
+            }
+            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_head = (GComponent)comp.GetChild("head");
+            m_nameText = (GTextField)comp.GetChild("nameText");
+            m_countText = (GTextField)comp.GetChild("countText");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_head = null;
+            m_nameText = null;
+            m_countText = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Component11
+    {
+        public GComponent target;
+        public GComponent m_head;
+        public GTextField m_nameText;
+        public const string URL = "ui://ri3cveycp3ft1t";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component11";
+        private static UI_Component11 _proxy;
+
+        public static UI_Component11 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component11();
+            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_Component11 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component11();
+            }
+            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_head = (GComponent)comp.GetChild("head");
+            m_nameText = (GTextField)comp.GetChild("nameText");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_head = null;
+            m_nameText = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Component12
+    {
+        public GComponent target;
+        public UI_Component14 m_playerImage;
+        public const string URL = "ui://ri3cveycp3ft20";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component12";
+        private static UI_Component12 _proxy;
+
+        public static UI_Component12 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component12();
+            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_Component12 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component12();
+            }
+            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_playerImage = (UI_Component14)UI_Component14.Create(comp.GetChild("playerImage"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_playerImage.Dispose();
+            m_playerImage = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Component13
+    {
+        public GComponent target;
+        public UI_Component15 m_playerImage;
+        public const string URL = "ui://ri3cveycp3ft24";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component13";
+        private static UI_Component13 _proxy;
+
+        public static UI_Component13 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component13();
+            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_Component13 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component13();
+            }
+            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_playerImage = (UI_Component15)UI_Component15.Create(comp.GetChild("playerImage"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_playerImage.Dispose();
+            m_playerImage = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_Component14.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_Component14
+    {
+        public GComponent target;
+        public GImage m_playerImage;
+        public const string URL = "ui://ri3cveycp3ft22";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component14";
+        private static UI_Component14 _proxy;
+
+        public static UI_Component14 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component14();
+            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_Component14 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component14();
+            }
+            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_playerImage = (GImage)comp.GetChild("playerImage");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_playerImage = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_Component15.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_Component15
+    {
+        public GComponent target;
+        public GImage m_playerImage;
+        public const string URL = "ui://ri3cveycp3ft23";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component15";
+        private static UI_Component15 _proxy;
+
+        public static UI_Component15 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component15();
+            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_Component15 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component15();
+            }
+            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_playerImage = (GImage)comp.GetChild("playerImage");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_playerImage = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,81 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Component2
+    {
+        public GComponent target;
+        public GComponent m_head;
+        public GTextField m_nameText;
+        public GTextField m_countText;
+        public UI_Component4 m_RankIndex;
+        public const string URL = "ui://ri3cveycp3ft1h";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            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_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            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_head = (GComponent)comp.GetChild("head");
+            m_nameText = (GTextField)comp.GetChild("nameText");
+            m_countText = (GTextField)comp.GetChild("countText");
+            m_RankIndex = (UI_Component4)UI_Component4.Create(comp.GetChild("RankIndex"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_head = null;
+            m_nameText = null;
+            m_countText = null;
+            m_RankIndex.Dispose();
+            m_RankIndex = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,87 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Component3
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GComponent m_head;
+        public GTextField m_nameText;
+        public GTextField m_countText;
+        public UI_Component4 m_RankIndex;
+        public const string URL = "ui://ri3cveycp3ft1i";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component3";
+        private static UI_Component3 _proxy;
+
+        public static UI_Component3 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component3();
+            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_Component3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component3();
+            }
+            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_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_head = (GComponent)comp.GetChild("head");
+            m_nameText = (GTextField)comp.GetChild("nameText");
+            m_countText = (GTextField)comp.GetChild("countText");
+            m_RankIndex = (UI_Component4)UI_Component4.Create(comp.GetChild("RankIndex"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_head = null;
+            m_nameText = null;
+            m_countText = null;
+            m_RankIndex.Dispose();
+            m_RankIndex = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Component4
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GLoader m_numBg;
+        public GLoader m_num1;
+        public GLoader m_num2;
+        public GLoader m_num3;
+        public GTextField m_RankText;
+        public const string URL = "ui://ri3cveycp3ft1m";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component4";
+        private static UI_Component4 _proxy;
+
+        public static UI_Component4 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component4();
+            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_Component4 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component4();
+            }
+            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_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_numBg = (GLoader)comp.GetChild("numBg");
+            m_num1 = (GLoader)comp.GetChild("num1");
+            m_num2 = (GLoader)comp.GetChild("num2");
+            m_num3 = (GLoader)comp.GetChild("num3");
+            m_RankText = (GTextField)comp.GetChild("RankText");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_numBg = null;
+            m_num1 = null;
+            m_num2 = null;
+            m_num3 = null;
+            m_RankText = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Component5
+    {
+        public GComponent target;
+        public GImage m_playerImage;
+        public GTextField m_seasonText;
+        public GTextField m_seasonName;
+        public GTextField m_openTime;
+        public const string URL = "ui://ri3cveycp3ft1o";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component5";
+        private static UI_Component5 _proxy;
+
+        public static UI_Component5 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component5();
+            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_Component5 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component5();
+            }
+            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_playerImage = (GImage)comp.GetChild("playerImage");
+            m_seasonText = (GTextField)comp.GetChild("seasonText");
+            m_seasonName = (GTextField)comp.GetChild("seasonName");
+            m_openTime = (GTextField)comp.GetChild("openTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_playerImage = null;
+            m_seasonText = null;
+            m_seasonName = null;
+            m_openTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_Component6
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GImage m_playerImage;
+        public GComponent m_head;
+        public GTextField m_nameText;
+        public GTextField m_countText;
+        public const string URL = "ui://ri3cveycp3ft1q";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "Component6";
+        private static UI_Component6 _proxy;
+
+        public static UI_Component6 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component6();
+            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_Component6 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component6();
+            }
+            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_c1 = comp.GetController("c1");
+            m_playerImage = (GImage)comp.GetChild("playerImage");
+            m_head = (GComponent)comp.GetChild("head");
+            m_nameText = (GTextField)comp.GetChild("nameText");
+            m_countText = (GTextField)comp.GetChild("countText");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_playerImage = null;
+            m_head = null;
+            m_nameText = null;
+            m_countText = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_ComponentName.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_ComponentName
+    {
+        public GComponent target;
+        public GTextField m_name;
+        public const string URL = "ui://ri3cveycp3ft2c";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "ComponentName";
+        private static UI_ComponentName _proxy;
+
+        public static UI_ComponentName Create(GObject gObject = null)
+        {
+            var ui = new UI_ComponentName();
+            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_ComponentName Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComponentName();
+            }
+            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_name = (GTextField)comp.GetChild("name");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_name = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionDetailUI
+    {
+        public GComponent target;
+        public GButton m_BtnBack;
+        public GList m_nameList;
+        public GList m_dressList;
+        public const string URL = "ui://ri3cveycp3ft2b";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionDetailUI";
+        private static UI_MatchingCompetitionDetailUI _proxy;
+
+        public static UI_MatchingCompetitionDetailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionDetailUI();
+            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_MatchingCompetitionDetailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionDetailUI();
+            }
+            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_BtnBack = (GButton)comp.GetChild("BtnBack");
+            m_nameList = (GList)comp.GetChild("nameList");
+            m_dressList = (GList)comp.GetChild("dressList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_BtnBack = null;
+            m_nameList = null;
+            m_dressList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,98 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionGatheringUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_bg;
+        public GGraph m_suitShow;
+        public GButton m_BtnBack;
+        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 const string URL = "ui://ri3cveychtuj0";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionGatheringUI";
+        private static UI_MatchingCompetitionGatheringUI _proxy;
+
+        public static UI_MatchingCompetitionGatheringUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionGatheringUI();
+            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_MatchingCompetitionGatheringUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionGatheringUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_suitShow = (GGraph)comp.GetChild("suitShow");
+            m_BtnBack = (GButton)comp.GetChild("BtnBack");
+            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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_bg = null;
+            m_suitShow = null;
+            m_BtnBack = null;
+            m_ruleBtn = null;
+            m_titleText = null;
+            m_timeText = null;
+            m_suitName = null;
+            m_btnUploadWorks = null;
+            m_btnShop = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionLookUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GImage m_playerImage;
+        public GButton m_BtnBack;
+        public const string URL = "ui://ri3cveycp3ft1r";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionLookUI";
+        private static UI_MatchingCompetitionLookUI _proxy;
+
+        public static UI_MatchingCompetitionLookUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionLookUI();
+            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_MatchingCompetitionLookUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionLookUI();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_playerImage = (GImage)comp.GetChild("playerImage");
+            m_BtnBack = (GButton)comp.GetChild("BtnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_playerImage = null;
+            m_BtnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,99 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionRankUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_bg;
+        public GButton m_BtnBack;
+        public GImage m_playerImage;
+        public GLoader m_ruleBtn;
+        public GTextField m_titleText;
+        public GButton m_btnBefore;
+        public GList m_RankList;
+        public UI_Component3 m_playerHead;
+        public GButton m_btnLook;
+        public const string URL = "ui://ri3cveycp3ft1g";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionRankUI";
+        private static UI_MatchingCompetitionRankUI _proxy;
+
+        public static UI_MatchingCompetitionRankUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionRankUI();
+            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_MatchingCompetitionRankUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionRankUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_BtnBack = (GButton)comp.GetChild("BtnBack");
+            m_playerImage = (GImage)comp.GetChild("playerImage");
+            m_ruleBtn = (GLoader)comp.GetChild("ruleBtn");
+            m_titleText = (GTextField)comp.GetChild("titleText");
+            m_btnBefore = (GButton)comp.GetChild("btnBefore");
+            m_RankList = (GList)comp.GetChild("RankList");
+            m_playerHead = (UI_Component3)UI_Component3.Create(comp.GetChild("playerHead"));
+            m_btnLook = (GButton)comp.GetChild("btnLook");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_bg = null;
+            m_BtnBack = null;
+            m_playerImage = null;
+            m_ruleBtn = null;
+            m_titleText = null;
+            m_btnBefore = null;
+            m_RankList = null;
+            m_playerHead.Dispose();
+            m_playerHead = null;
+            m_btnLook = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionRewardItem
+    {
+        public GComponent target;
+        public GList m_rewardList;
+        public GTextField m_rankIndex;
+        public const string URL = "ui://ri3cveycp3ft29";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionRewardItem";
+        private static UI_MatchingCompetitionRewardItem _proxy;
+
+        public static UI_MatchingCompetitionRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionRewardItem();
+            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_MatchingCompetitionRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionRewardItem();
+            }
+            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_rewardList = (GList)comp.GetChild("rewardList");
+            m_rankIndex = (GTextField)comp.GetChild("rankIndex");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rewardList = null;
+            m_rankIndex = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionRuleTips
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_titleText;
+        public GButton m_btnReward;
+        public GButton m_btnRule;
+        public GList m_rewardList;
+        public const string URL = "ui://ri3cveycp3ft28";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionRuleTips";
+        private static UI_MatchingCompetitionRuleTips _proxy;
+
+        public static UI_MatchingCompetitionRuleTips Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionRuleTips();
+            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_MatchingCompetitionRuleTips Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionRuleTips();
+            }
+            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_c1 = comp.GetController("c1");
+            m_titleText = (GTextField)comp.GetChild("titleText");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_titleText = null;
+            m_btnReward = null;
+            m_btnRule = null;
+            m_rewardList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,119 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionSelectUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public UI_Component12 m_playerShow1;
+        public UI_Component13 m_playerShow2;
+        public GLoader m_ruleBtn;
+        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 GButton m_BtnBack;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://ri3cveycp3ft1s";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionSelectUI";
+        private static UI_MatchingCompetitionSelectUI _proxy;
+
+        public static UI_MatchingCompetitionSelectUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionSelectUI();
+            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_MatchingCompetitionSelectUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionSelectUI();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_playerShow1 = (UI_Component12)UI_Component12.Create(comp.GetChild("playerShow1"));
+            m_playerShow2 = (UI_Component13)UI_Component13.Create(comp.GetChild("playerShow2"));
+            m_ruleBtn = (GLoader)comp.GetChild("ruleBtn");
+            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_BtnBack = (GButton)comp.GetChild("BtnBack");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_playerShow1.Dispose();
+            m_playerShow1 = null;
+            m_playerShow2.Dispose();
+            m_playerShow2 = null;
+            m_ruleBtn = null;
+            m_titleText = null;
+            m_player1.Dispose();
+            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_BtnBack = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,114 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionUpLoadUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_bg;
+        public GImage m_playerImage;
+        public GButton m_BtnBack;
+        public GButton m_btnLook;
+        public GLoader m_ruleBtn;
+        public GTextField m_titleText;
+        public GTextField m_timeText;
+        public GButton m_btnRank;
+        public GButton m_btnUploadWorks;
+        public GButton m_btnShop;
+        public GButton m_btnMyWorks;
+        public UI_Component1 m_playerHead;
+        public GButton m_btnExchage;
+        public GLoader m_countTime;
+        public const string URL = "ui://ri3cveycp3ft1c";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionUpLoadUI";
+        private static UI_MatchingCompetitionUpLoadUI _proxy;
+
+        public static UI_MatchingCompetitionUpLoadUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionUpLoadUI();
+            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_MatchingCompetitionUpLoadUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionUpLoadUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_playerImage = (GImage)comp.GetChild("playerImage");
+            m_BtnBack = (GButton)comp.GetChild("BtnBack");
+            m_btnLook = (GButton)comp.GetChild("btnLook");
+            m_ruleBtn = (GLoader)comp.GetChild("ruleBtn");
+            m_titleText = (GTextField)comp.GetChild("titleText");
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_btnRank = (GButton)comp.GetChild("btnRank");
+            m_btnUploadWorks = (GButton)comp.GetChild("btnUploadWorks");
+            m_btnShop = (GButton)comp.GetChild("btnShop");
+            m_btnMyWorks = (GButton)comp.GetChild("btnMyWorks");
+            m_playerHead = (UI_Component1)UI_Component1.Create(comp.GetChild("playerHead"));
+            m_btnExchage = (GButton)comp.GetChild("btnExchage");
+            m_countTime = (GLoader)comp.GetChild("countTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_bg = null;
+            m_playerImage = null;
+            m_BtnBack = null;
+            m_btnLook = null;
+            m_ruleBtn = null;
+            m_titleText = null;
+            m_timeText = null;
+            m_btnRank = null;
+            m_btnUploadWorks = null;
+            m_btnShop = null;
+            m_btnMyWorks = null;
+            m_playerHead.Dispose();
+            m_playerHead = null;
+            m_btnExchage = null;
+            m_countTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionWorkListUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GGraph m_suitShow;
+        public GButton m_BtnBack;
+        public GTextField m_titleText;
+        public GList m_workList;
+        public const string URL = "ui://ri3cveycp3ft1p";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionWorkListUI";
+        private static UI_MatchingCompetitionWorkListUI _proxy;
+
+        public static UI_MatchingCompetitionWorkListUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionWorkListUI();
+            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_MatchingCompetitionWorkListUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionWorkListUI();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_suitShow = (GGraph)comp.GetChild("suitShow");
+            m_BtnBack = (GButton)comp.GetChild("BtnBack");
+            m_titleText = (GTextField)comp.GetChild("titleText");
+            m_workList = (GList)comp.GetChild("workList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_suitShow = null;
+            m_BtnBack = null;
+            m_titleText = null;
+            m_workList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingCompetitionWorksUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GButton m_BtnBack;
+        public GTextField m_titleText;
+        public GList m_worksList;
+        public const string URL = "ui://ri3cveycp3ft1n";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingCompetitionWorksUI";
+        private static UI_MatchingCompetitionWorksUI _proxy;
+
+        public static UI_MatchingCompetitionWorksUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingCompetitionWorksUI();
+            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_MatchingCompetitionWorksUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingCompetitionWorksUI();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_BtnBack = (GButton)comp.GetChild("BtnBack");
+            m_titleText = (GTextField)comp.GetChild("titleText");
+            m_worksList = (GList)comp.GetChild("worksList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_BtnBack = null;
+            m_titleText = null;
+            m_worksList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MatchingCompetition
+{
+    public partial class UI_MatchingDressItem
+    {
+        public GComponent target;
+        public GImage m_iconSelected;
+        public GTextField m_txtTitle;
+        public GLoader m_icon;
+        public const string URL = "ui://ri3cveycp3ft2r";
+        public const string PACKAGE_NAME = "MatchingCompetition";
+        public const string RES_NAME = "MatchingDressItem";
+        private static UI_MatchingDressItem _proxy;
+
+        public static UI_MatchingDressItem Create(GObject gObject = null)
+        {
+            var ui = new UI_MatchingDressItem();
+            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_MatchingDressItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MatchingDressItem();
+            }
+            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_iconSelected = (GImage)comp.GetChild("iconSelected");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_icon = (GLoader)comp.GetChild("icon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_iconSelected = null;
+            m_txtTitle = null;
+            m_icon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ButtonInValueBar.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_ButtonInValueBar
+    {
+        public GButton target;
+        public GImage m_imgAdd;
+        public const string URL = "ui://wgkh30qjhtuj4e";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "ButtonInValueBar";
+        private static UI_ButtonInValueBar _proxy;
+
+        public static UI_ButtonInValueBar Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonInValueBar();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonInValueBar Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonInValueBar();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_imgAdd = (GImage)comp.GetChild("imgAdd");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_imgAdd = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ButtonInValueBar.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs

@@ -24,6 +24,7 @@ namespace UI.MiniGame
         public GButton m_shopBtn;
         public UI_NewMaterialShowView m_newMaterial;
         public UI_MergeGameItemUI m_guildDouBaoBtn;
+        public UI_ButtonInValueBar m_btnProp;
         public const string URL = "ui://wgkh30qjqbf42v";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "MergeGameUI";
@@ -88,6 +89,7 @@ namespace UI.MiniGame
             m_shopBtn = (GButton)comp.GetChild("shopBtn");
             m_newMaterial = (UI_NewMaterialShowView)UI_NewMaterialShowView.Create(comp.GetChild("newMaterial"));
             m_guildDouBaoBtn = (UI_MergeGameItemUI)UI_MergeGameItemUI.Create(comp.GetChild("guildDouBaoBtn"));
+            m_btnProp = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnProp"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -113,6 +115,8 @@ namespace UI.MiniGame
             m_newMaterial = null;
             m_guildDouBaoBtn.Dispose();
             m_guildDouBaoBtn = null;
+            m_btnProp.Dispose();
+            m_btnProp = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGamematerialItem.cs

@@ -7,6 +7,7 @@ namespace UI.MiniGame
     public partial class UI_MergeGamematerialItem
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_iconBg;
         public GLoader m_icon;
         public GLoader m_newIcon;
@@ -58,6 +59,7 @@ namespace UI.MiniGame
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_iconBg = (GLoader)comp.GetChild("iconBg");
             m_icon = (GLoader)comp.GetChild("icon");
             m_newIcon = (GLoader)comp.GetChild("newIcon");
@@ -65,6 +67,7 @@ namespace UI.MiniGame
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_iconBg = null;
             m_icon = null;
             m_newIcon = null;

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

@@ -0,0 +1,25 @@
+using ET;
+
+namespace GFGGame
+{
+    public class MatchingCompetitionSproxy
+    {
+        //获取搭配评选赛搭配数据，道具数据，人物位置数据
+        public static async ETTask<bool> ReqMatchingCompetitionDressData(int roleID)
+        {
+            //C2S_GetDay7Reward
+            var response = await MessageHelper.SendToServer(new C2S_GetDay7Reward { Id = roleID });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            DressUpData data = null;
+            if (data == null)
+            {
+                MatchingCompetitionDataManager.Instance.MathingDressDate = DressUpData.CreateDefault();
+            }
+            else 
+            {
+                MatchingCompetitionDataManager.Instance.MathingDressDate = data;
+            }
+            return true;
+        }
+    }
+}

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

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

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

@@ -4,6 +4,7 @@ using UnityEngine;
 using System.Collections.Generic;
 using ET;
 using System;
+using System.Collections;
 
 namespace GFGGame
 {
@@ -184,7 +185,15 @@ namespace GFGGame
             currentIndex = CustomSuitDataManager.currentIndex;
             _ui.m_comboBox.items = CustomSuitDataManager.GetSuitPosItems();
             _ui.m_comboBox.selectedIndex = currentIndex;
-            MyDressUpHelper.PutOnSuitSavedByPos(currentIndex);
+            if(this.viewData != null && (int)this.viewData == 2)
+            {
+                MyDressUpHelper.dressUpObj.PutOnDressUpData(MatchingCompetitionDataManager.Instance.MathingDressDate);
+            }
+            else
+            {
+                MyDressUpHelper.PutOnSuitSavedByPos(currentIndex);
+            }
+            
             UpdateStepBtn(true);
 
             Timers.inst.AddUpdate(CheckGuide);
@@ -250,7 +259,6 @@ namespace GFGGame
         {
             if (!MyDressUpHelper.OnClickBtnNextStep()) return;
             UpdateStepBtn(false);
-
         }
         private void OnComboBoxChanged()
         {
@@ -503,7 +511,14 @@ namespace GFGGame
         {
             _currentList2 = null;
             currentListType = DressUpListType.List1;
-            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length;
+            if (this.viewData != null &&(int)this.viewData != 2)
+            {
+                _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length;
+            }
+            else
+            {
+                _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 3;
+            }
             GTween.To(_ui.target.width, listType1X, 0.5f)
                 .SetTarget(_ui.m_comListType1.target)
                 .OnUpdate((GTweener t) =>
@@ -717,6 +732,13 @@ namespace GFGGame
         {
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
             DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[index];
+            if(this.viewData != null && (int)this.viewData == 2)
+            {
+                if(index == DressUpMenuItemCfg1Array.Instance.dataArray.Length - 4)
+                {
+                    item1 = DressUpMenuItemCfg1Array.Instance.dataArray[index+1];
+                }
+            }
             typeItem.m_icon.url = "ui://DressUp/hz_fenleitu_" + item1.id;
             typeItem.m_txtname.text = item1.name;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconzi_" + item1.id;
@@ -1092,9 +1114,25 @@ namespace GFGGame
             {
                 return;
             }
+            if (this.viewData != null && (int)this.viewData == 2)
+            {
+                ViewManager.Show<LoadingView>();
+                LoadingView.Instance.SetDesc("正在摆放道具...");
+                Timers.inst.StartCoroutine(UpdateLoadProgress());
+            }
             _ui.target.visible = false;
             this._sceneObject.gameObject.SetActive(false);
         }
+        private IEnumerator UpdateLoadProgress()
+        {
+            yield return new WaitForEndOfFrame();
+            LoadingView.Instance.SetProgress(100, () =>
+            {
+                ViewManager.Hide<LoadingView>();
+            }
+            );
+
+        }
         private void UpdateScene()
         {
             _ui.target.visible = true;

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

@@ -4,10 +4,12 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using UI.DressUp;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using System.Threading.Tasks;
 
 namespace GFGGame
 {
@@ -111,7 +113,7 @@ namespace GFGGame
 
         }
 
-        protected override void OnShown()
+        protected override async void OnShown()
         {
             base.OnShown();
             Input.multiTouchEnabled = true;
@@ -138,6 +140,7 @@ namespace GFGGame
 
             _ui.m_ComSelectRes.m_comBtnTab.m_c1.selectedIndex = 0;
 
+            MatchingCompetitionDataManager.Instance.itemGameObjs.Clear();
             RefreshList(EnumPhotographType.BG);
             SetUIView();
             PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(MyDressUpHelper.dressUpObj.bgId));
@@ -149,6 +152,11 @@ namespace GFGGame
             _ui.m_txtCount.text = string.Format("{0}/{1}", PoemGalleryDataManager.Instance.MyWorksCountOfTheme, GlobalCfgArray.globalCfg.maxGalleryWorksCount);
 
             Timers.inst.AddUpdate(CheckGuide);
+            //Timers.inst.Add(0.5f, 1, UpdateSceneTransform);
+            if(this.viewData != null && (int)this.viewData == 2)
+            {
+                await UpdateSceneTransform();
+            }  
         }
 
         /************************************************************UI界面*********************************************************/
@@ -255,7 +263,7 @@ namespace GFGGame
             switch (type)
             {
                 case EnumPhotographType.BG:
-
+                    MatchingCompetitionDataManager.Instance.DressUpBgID = itemCfg.id;
                     PhotographSceneManager.Instance.AddBgItem(itemCfg);
                     break;
 
@@ -279,15 +287,49 @@ namespace GFGGame
         //添加初始场景道具
         private void UpdateScene()
         {
-            ICollection keys = _equipSceneData.Keys;
-            foreach (int key in keys)
+            if (this.viewData == null || (int)this.viewData != 2)
             {
-                for (int i = 0; i < _equipSceneData[key].Count; i++)
+                ICollection keys = _equipSceneData.Keys;
+                foreach (int key in keys)
                 {
-                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(key);
-
-                    AddSceneItem(itemCfg, false);
+                    for (int i = 0; i < _equipSceneData[key].Count; i++)
+                    {
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(key);
+                        AddSceneItem(itemCfg, false);
+                    }
+                }
+            }
+            else
+            {
+                //对搭配赛特殊处理
+                for (int i = 0; i < MatchingCompetitionDataManager.Instance.DressPropIdList.Count; i++)
+                {
+                    if(MatchingCompetitionDataManager.Instance.DressPropIdList[i] == 0)
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.DressPropIdList[i]);
+                        AddSceneItem(itemCfg, true);                    
+                    }
                 }
+
+            }
+        }
+        public async Task UpdateSceneTransform()
+        {
+            //int time = 5 * (MatchingCompetitionDataManager.Instance.TransformDataList.Count+1);
+            await Task.Delay(100);
+            MatchingCompetitionDataManager.Instance.InsertGameObjectList();
+            for (int i = 0; i < MatchingCompetitionDataManager.Instance.TransformDataList.Count; i++)
+            {
+                TransformData itemdata = MatchingCompetitionDataManager.Instance.TransformDataList[i];
+                GameObject itemGObj = MatchingCompetitionDataManager.Instance.itemGameObjs[i];
+                MatchingCompetitionDataManager.Instance.itemGameObjs[i].transform.position = itemdata.position;
+                MatchingCompetitionDataManager.Instance.itemGameObjs[i].transform.Rotate(itemGObj.transform.eulerAngles.x, itemGObj.transform.eulerAngles.y, itemdata.rotationZ);
+                MatchingCompetitionDataManager.Instance.itemGameObjs[i].transform.localScale = itemdata.scale;
+                PhotographUtil.Instance.ChangeLayer(MatchingCompetitionDataManager.Instance.itemGameObjs[i], i * PhotographDataManager.layerCount, "up");
             }
         }
 
@@ -666,6 +708,17 @@ namespace GFGGame
                     }
                 });
             }
+            else if (_ui.m_c1.selectedIndex == 2)
+            {
+                MatchingCompetitionDataManager.Instance.itemGameObjs = _itemGameObjs.ToList();
+                MatchingCompetitionDataManager.Instance.MathingDressDate = MyDressUpHelper.dressUpObj.DressUpDataClone();
+                MatchingCompetitionDataManager.Instance.SetTransformData();
+                AlertUI.Show("作品已保存，是否确认上传此作品？")
+                .SetLeftButton(true, "否").SetRightButton(true, "是", async (object data) =>
+                {  
+                    
+                });
+            }
         }
         private void OnClickBtnBack()
         {
@@ -692,6 +745,7 @@ namespace GFGGame
             rotationGesture = null;
             _ui.m_c1.selectedIndex = 0;
             Timers.inst.Remove(CheckGuide);
+            //Timers.inst.Remove(UpdateSceneTransform);
         }
 
         private void CheckGuide(object param)

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 39fd3a8c0b9ba9643b509701937843c2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using ET;
+using FairyGUI;
+using UI.MatchingCompetition;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class MatchingCompetitionDetailView : BaseWindow
+    {
+        private UI_MatchingCompetitionDetailUI _ui;
+        private GameObject _sceneObject;
+        private int _seasonIndex = 0;
+        public override void Dispose()
+        {
+            if (_sceneObject != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObject);
+                _sceneObject = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MatchingCompetitionDetailUI.PACKAGE_NAME;
+            _ui = UI_MatchingCompetitionDetailUI.Create();
+            this.viewCom = _ui.target;
+            isReturnView = true;
+            isfullScreen = true;
+
+            _ui.m_BtnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_nameList.onClickItem.Add(OnClickListType1Item);
+            _ui.m_dressList.onClickItem.Add(OnClickListType2Item);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            if (_sceneObject == null)
+            {
+                _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("ScenePhotograph"));
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
+            }
+            UpdateDress();
+            UpdateView();
+        }
+
+        protected override void OnHide()
+        {
+            if (_sceneObject != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObject);
+                _sceneObject = null;
+            }
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void UpdateView()
+        {
+        }
+        private async void UpdateDress()
+        {
+            //这里要换成获取其他玩家数据
+                MatchingCompetitionDataManager.Instance.itemGameObjs.Clear();
+                PhotographDataManager.Instance.itemGameObjs.Clear();
+                if (_sceneObject == null)
+                {
+                    _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("ScenePhotograph"));
+                }
+                PhotographSceneManager.Instance.sceneObject = _sceneObject;
+                if (MatchingCompetitionDataManager.Instance.DressUpBgID == 0)
+                {
+                    PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(180001));
+                }
+                else
+                {
+                    PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.DressUpBgID));
+                }
+                PhotographSceneManager.Instance.AddBodyItem();
+                GameObject bodyParent = _sceneObject.transform.Find("Scene/Role").gameObject;
+                PhotographDataManager.Instance.dressUpObj.setSceneObj(_sceneObject, false, true, bodyParent, false, null);
+                PhotographDataManager.Instance.dressUpObj.PutOnDressUpData(MatchingCompetitionDataManager.Instance.MathingDressDate);
+
+                //对搭配赛特殊处理
+                for (int i = 0; i < MatchingCompetitionDataManager.Instance.DressPropIdList.Count; i++)
+                {
+                    if (MatchingCompetitionDataManager.Instance.DressPropIdList[i] == 0)
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.DressPropIdList[i]);
+                        MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg, true);
+                    }
+                }
+                await Task.Delay(100);
+                MatchingCompetitionDataManager.Instance.InsertGameObjectList();
+                for (int i = 0; i < MatchingCompetitionDataManager.Instance.TransformDataList.Count; i++)
+                {
+                    TransformData itemdata = MatchingCompetitionDataManager.Instance.TransformDataList[i];
+                    GameObject itemGObj = MatchingCompetitionDataManager.Instance.itemGameObjs[i];
+                    MatchingCompetitionDataManager.Instance.itemGameObjs[i].transform.position = itemdata.position;
+                    MatchingCompetitionDataManager.Instance.itemGameObjs[i].transform.Rotate(itemGObj.transform.eulerAngles.x, itemGObj.transform.eulerAngles.y, itemdata.rotationZ);
+                    MatchingCompetitionDataManager.Instance.itemGameObjs[i].transform.localScale = itemdata.scale;
+                    PhotographUtil.Instance.ChangeLayer(MatchingCompetitionDataManager.Instance.itemGameObjs[i], i * PhotographDataManager.layerCount, "up");
+                }
+        }
+        private void OnClickListType1Item(EventContext context)
+        {
+            
+        }
+
+        private void OnClickListType2Item(EventContext context)
+        {
+            
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(MatchingCompetitionDetailView).FullName);
+        }
+    }
+}

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

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

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

@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MatchingCompetition;
+using UnityEngine;
+
+namespace GFGGame
+{
+    //搭配赛集合期间
+    class MatchingCompetitionGatheringView : BaseWindow
+    {
+        private UI_MatchingCompetitionGatheringUI _ui;
+        private ValueBarController _valueBarController;
+        private int SuitID;
+        private EffectUI _effectUI1;
+
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MatchingCompetitionGatheringUI.PACKAGE_NAME;
+            _ui = UI_MatchingCompetitionGatheringUI.Create();
+            this.viewCom = _ui.target;
+            isReturnView = true;
+            isfullScreen = true;
+
+            _ui.m_BtnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnUploadWorks.onClick.Add(OnClickBtnUpload);
+            _ui.m_btnShop.onClick.Add(OnClickBtnShop);
+            _ui.m_ruleBtn.onClick.Add(MatchingCompetitionDataManager.Instance.OnClickBtnRule);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_c1.selectedIndex = 0;
+            SuitID = 201030;
+            UpdateView();
+            Timers.inst.AddUpdate(UpdateTime);
+        }
+
+        protected override void OnHide()
+        {
+
+            DressUpObjUI dressUpObjUI = _ui.m_suitShow.data as DressUpObjUI;
+            if (dressUpObjUI != null)
+            {
+                dressUpObjUI.Dispose();
+            }
+            _ui.m_suitShow.data = null;
+            base.OnHide();
+            Timers.inst.Remove(UpdateTime);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void UpdateView()
+        {
+            if (true)
+            {
+                DressUpObjUI dressUpObjUI;
+                if (_ui.m_suitShow.data == null)
+                {
+                    _ui.m_suitShow.data = new DressUpObjUI("SceneSuitFoster");
+                }
+                bool showAction = SuitCfgArray.Instance.CheckSuitHasAction(SuitID) && DressUpMenuSuitDataManager.CheckSuitHasActionRes(SuitID);
+                dressUpObjUI = _ui.m_suitShow.data as DressUpObjUI;
+                dressUpObjUI.ResetSceneObj(100, false, true, null, false);
+                dressUpObjUI.dressUpObj.PutOnSuitCfg(SuitID, showAction, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
+                dressUpObjUI.UpdateWrapper(_ui.m_suitShow);
+            }
+        }
+        private void UpdateTime(object param = null)
+        {
+
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(MatchingCompetitionGatheringView).FullName);
+        }
+        private void OnClickBtnUpload()
+        {
+            ViewManager.Show<DressUpView>(2, false);
+        }
+        private void OnClickBtnShop()
+        {
+            ViewManager.Show<MatchingCompetitionUpLoadView>();
+            //ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+        }
+
+    }
+}

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

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

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

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MatchingCompetition;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class MatchingCompetitionRankView : BaseWindow
+    {
+        private UI_MatchingCompetitionRankUI _ui;
+        private int _currentIndex = 0;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MatchingCompetitionRankUI.PACKAGE_NAME;
+            _ui = UI_MatchingCompetitionRankUI.Create();
+            this.viewCom = _ui.target;
+            isReturnView = true;
+            isfullScreen = true;
+
+            _ui.m_RankList.itemRenderer = RenderRankList;
+            _ui.m_BtnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnBefore.onClick.Add(OnClickBtnBefore);
+            _ui.m_btnLook.onClick.Add(OnClickBtnLook);
+            _ui.m_ruleBtn.onClick.Add(MatchingCompetitionDataManager.Instance.OnClickBtnRule);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            UpdateView();
+            UpdateHead();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void UpdateView()
+        {
+            MatchingPlayerData otherInfo = MatchingCompetitionDataManager.Instance._currentRankList[0];
+            _ui.m_playerImage.texture = otherInfo.Ntexture;
+            _currentIndex = 0;
+            _ui.m_RankList.numItems = MatchingCompetitionDataManager.Instance._currentRankList.Count;
+        }
+        private void UpdateHead()
+        {
+            MatchingPlayerData otherInfo = new MatchingPlayerData();
+            RoleInfoManager.Instance.UpdateHead(_ui.m_playerHead.m_head, otherInfo.HeadId, otherInfo.HeadBorderId);
+            _ui.m_playerHead.m_nameText.text = otherInfo.OtherPlayerName.ToString();
+            _ui.m_playerHead.m_countText.text = otherInfo.OtherPlayerPopularity.ToString();
+            MatchingCompetitionDataManager.Instance.SetNumToRank(otherInfo.Rank,_ui.m_playerHead.m_RankIndex);
+        }
+        private void RenderRankList(int index, GObject obj)
+        {
+            UI_Component3 item = UI_Component3.Proxy(obj);
+            MatchingPlayerData otherInfo = new MatchingPlayerData();
+            otherInfo.Rank = index;
+            RoleInfoManager.Instance.UpdateHead(item.m_head, otherInfo.HeadId, otherInfo.HeadBorderId);
+            item.m_nameText.text = otherInfo.OtherPlayerName.ToString();
+            item.m_countText.text = otherInfo.OtherPlayerPopularity.ToString();
+            MatchingCompetitionDataManager.Instance.SetNumToRank(otherInfo.Rank, item.m_RankIndex);
+            if(item.target.data == null)
+            {
+                item.target.onClick.Add(OnClickBtnItem);
+            }
+            item.target.data = index;
+            UI_Component3.ProxyEnd();
+        }
+        private void OnClickBtnItem(EventContext context)
+        {
+            GObject item = context.sender as GObject;
+            int index = (int)item.data;
+            _currentIndex = index; 
+            MatchingPlayerData otherInfo = MatchingCompetitionDataManager.Instance._currentRankList[index];
+            _ui.m_playerImage.texture = otherInfo.Ntexture;
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(MatchingCompetitionRankView).FullName);
+        }
+        private void OnClickBtnBefore()
+        {
+            ViewManager.Show<MatchingCompetitionWorksView>();
+        }
+        private void OnClickBtnLook()
+        {
+
+        }
+    }
+}

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

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

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

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MatchingCompetition;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class MatchingCompetitionRuleTipsView : BaseWindow
+    {
+        private UI_MatchingCompetitionRuleTips _ui;
+        private int Season = 1;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MatchingCompetitionRuleTips.PACKAGE_NAME;
+            _ui = UI_MatchingCompetitionRuleTips.Create();
+            this.viewCom = _ui.target;
+            modal = true;
+            this.viewCom.Center();
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_rewardList.itemRenderer =  RewardItemRender;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            Season = MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void RewardItemRender(int index, GObject obj)
+        {
+            UI_MatchingCompetitionRewardItem item = UI_MatchingCompetitionRewardItem.Proxy(obj);
+
+            item.m_rankIndex.text = (index + 1).ToString();
+            if (item.m_rewardList.data == null)
+            {
+                item.m_rewardList.itemRenderer = SpecialRewardRender;
+            }
+            //item.m_rewardList.data = 
+            //item.m_rewardList.numItems = 
+            UI_MatchingCompetitionRewardItem.ProxyEnd();
+        }
+        private static void SpecialRewardRender(int index, GObject obj)
+        {
+            var itemInfo = (int[])obj.parent.data;
+            var itemData = ItemUtil.createItemData(itemInfo);
+            var itemView = new ItemView(obj as GComponent);
+            obj.data ??= itemView;
+            itemView.SetData(itemData);
+            itemView.ChangeTxtCountStyle();
+        }
+    }
+}

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

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

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

@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MatchingCompetition;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class MatchingCompetitionSelectView : BaseWindow
+    {
+        private UI_MatchingCompetitionSelectUI _ui;
+        private int _seasonIndex = 0;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MatchingCompetitionSelectUI.PACKAGE_NAME;
+            _ui = UI_MatchingCompetitionSelectUI.Create();
+            this.viewCom = _ui.target;
+            isReturnView = true;
+            isfullScreen = true;
+
+            _ui.m_BtnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_select1.target.onClick.Add(OnClickBtnSelect1);
+            _ui.m_select2.target.onClick.Add(OnClickBtnSelect2);
+            _ui.m_ruleBtn.onClick.Add(MatchingCompetitionDataManager.Instance.OnClickBtnRule);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_BtnBack.touchable = true;
+
+            UpdateView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void UpdateView()
+        {
+            _ui.m_playerShow1.m_playerImage.m_playerImage.texture = null;
+            _ui.m_playerShow2.m_playerImage.m_playerImage.texture = null;
+            _ui.m_selectText1.alpha = 0;
+            _ui.m_selectText2.alpha = 0;
+            _ui.m_timeText.text = string.Format("剩余次数：{0}", MatchingCompetitionDataManager.Instance.MatchingRemainingTimes);
+        }
+        private void OnClickBtnBack()
+        {
+            _ui.m_BtnBack.touchable = true;
+            ViewManager.GoBackFrom(typeof(MatchingCompetitionSelectView).FullName);
+        }
+        private void OnClickBtnSelect1()
+        {
+            if(MatchingCompetitionDataManager.Instance.MatchingRemainingTimes<=0)
+            {
+                return;
+            }
+            _ui.m_select1.m_c1.selectedIndex = 1;
+            _ui.m_select1.m_numText.text = string.Format("心动值{0}", 0);
+            _ui.m_BtnBack.touchable = false;
+            _ui.m_t0.Play(()=>OnClickBtnBack());
+        }
+        private void OnClickBtnSelect2()
+        {
+            if (MatchingCompetitionDataManager.Instance.MatchingRemainingTimes <= 0)
+            {
+                return;
+            }
+            _ui.m_select2.m_c1.selectedIndex = 1;
+            _ui.m_select2.m_numText.text = string.Format("心动值{0}", 0);
+            _ui.m_BtnBack.touchable = false;
+            _ui.m_t1.Play(() => OnClickBtnBack());
+        }
+    }
+}

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

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

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

@@ -0,0 +1,207 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using ET;
+using FairyGUI;
+using UI.MatchingCompetition;
+using UnityEngine;
+
+namespace GFGGame
+{
+    //搭配赛评选期间
+    class MatchingCompetitionUpLoadView : BaseWindow
+    {
+        private UI_MatchingCompetitionUpLoadUI _ui;
+        private GameObject _sceneObject;
+        private float countTimeSpeed = 0.0015f;
+        private bool isCountTime = false;
+        public override void Dispose()
+        {
+            if (_sceneObject != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObject);
+                _sceneObject = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MatchingCompetitionUpLoadUI.PACKAGE_NAME;
+            _ui = UI_MatchingCompetitionUpLoadUI.Create();
+            this.viewCom = _ui.target;
+            isReturnView = true;
+            isfullScreen = true;
+
+            _ui.m_BtnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnUploadWorks.onClick.Add(OnClickBtnUpload);
+            _ui.m_btnShop.onClick.Add(OnClickBtnShop);
+            _ui.m_btnMyWorks.onClick.Add(OnClickBtnMyWorks);
+            _ui.m_btnRank.onClick.Add(OnClickBtnRank);
+            _ui.m_btnLook.onClick.Add(OnClickBtnLook);
+            _ui.m_btnExchage.onClick.Add(OnClickBtnExchange);
+            _ui.m_ruleBtn.onClick.Add(MatchingCompetitionDataManager.Instance.OnClickBtnRule);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_c1.selectedIndex = 1;
+            isCountTime = false;
+            UpdateView();
+            UpdateHead();
+            UpdateDress();
+            Timers.inst.AddUpdate(UpdateTime);
+        }
+
+        protected override void OnHide()
+        {
+            if (_sceneObject != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObject);
+                _sceneObject = null;
+            }
+            Timers.inst.Remove(UpdateTime);
+            Timers.inst.Remove(UpdateCountTime);
+            base.OnHide();     
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private async void UpdateDress()
+        {
+            //这里要换成获取其他玩家数据
+            if (MatchingCompetitionDataManager.Instance.MathingDressDate.actionId != 0)
+            {
+                _ui.m_bg.visible = false;
+                _ui.m_playerImage.visible = false;
+                MatchingCompetitionDataManager.Instance.itemGameObjs.Clear();
+                PhotographDataManager.Instance.itemGameObjs.Clear();
+                if (_sceneObject == null)
+                {
+                    _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("ScenePhotograph"));
+                }
+                PhotographSceneManager.Instance.sceneObject = _sceneObject;
+                if(MatchingCompetitionDataManager.Instance.DressUpBgID == 0)
+                {
+                    PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(180001));
+                }
+                else
+                {
+                    PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.DressUpBgID));
+                }
+                PhotographSceneManager.Instance.AddBodyItem();
+                GameObject bodyParent = _sceneObject.transform.Find("Scene/Role").gameObject;
+                PhotographDataManager.Instance.dressUpObj.setSceneObj(_sceneObject, false, true, bodyParent, false, null);
+                PhotographDataManager.Instance.dressUpObj.PutOnDressUpData(MatchingCompetitionDataManager.Instance.MathingDressDate);
+                
+                //对搭配赛特殊处理
+                for (int i = 0; i < MatchingCompetitionDataManager.Instance.DressPropIdList.Count; i++)
+                {
+                    if (MatchingCompetitionDataManager.Instance.DressPropIdList[i] == 0)
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.DressPropIdList[i]);
+                        MatchingCompetitionDataManager.Instance.AddSceneItem(itemCfg, true);
+                    }
+                }
+                await Task.Delay(100);
+                MatchingCompetitionDataManager.Instance.InsertGameObjectList();
+                for (int i = 0; i < MatchingCompetitionDataManager.Instance.TransformDataList.Count; i++)
+                {
+                    TransformData itemdata = MatchingCompetitionDataManager.Instance.TransformDataList[i];
+                    GameObject itemGObj = MatchingCompetitionDataManager.Instance.itemGameObjs[i];
+                    MatchingCompetitionDataManager.Instance.itemGameObjs[i].transform.position = itemdata.position;
+                    MatchingCompetitionDataManager.Instance.itemGameObjs[i].transform.Rotate(itemGObj.transform.eulerAngles.x, itemGObj.transform.eulerAngles.y, itemdata.rotationZ);
+                    MatchingCompetitionDataManager.Instance.itemGameObjs[i].transform.localScale = itemdata.scale;
+                    PhotographUtil.Instance.ChangeLayer(MatchingCompetitionDataManager.Instance.itemGameObjs[i], i * PhotographDataManager.layerCount, "up");
+                }
+            }
+            else
+            {
+                _ui.m_bg.visible = true;
+                _ui.m_playerImage.visible = true;
+                _ui.m_playerImage.texture = null;
+            }
+        }
+        private void UpdateView()
+        {
+            _ui.m_countTime.fillAmount = 0;
+            _ui.m_countTime.visible = false;
+        }
+        private void UpdateHead()
+        {
+            MatchingPlayerData otherInfo = new MatchingPlayerData();
+            RoleInfoManager.Instance.UpdateHead(_ui.m_playerHead.m_head, otherInfo.HeadId, otherInfo.HeadBorderId);
+            _ui.m_playerHead.m_nameText.text = otherInfo.OtherPlayerName.ToString();
+            _ui.m_playerHead.m_countText.text = otherInfo.OtherPlayerPopularity.ToString();
+        }
+        private void UpdateTime(object param = null)
+        {
+
+        }
+        private void UpdateCountTime(object param = null)
+        {
+            if(_ui.m_countTime.fillAmount <=0)
+            {
+                _ui.m_countTime.fillAmount = 0;
+                _ui.m_countTime.visible = false;
+                isCountTime = false;
+                Timers.inst.Remove(UpdateCountTime);
+            }
+            _ui.m_countTime.fillAmount -= countTimeSpeed;
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(MatchingCompetitionUpLoadView).FullName);
+        }
+        private void OnClickBtnUpload()
+        {
+            //先获取两个玩家信息
+            ViewManager.Show<MatchingCompetitionSelectView>();
+        }
+        private void OnClickBtnShop()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+        }
+        private void OnClickBtnMyWorks()
+        {
+            ViewManager.Show<PoemPhotoView>(1);
+        }
+        private void OnClickBtnRank()
+        {
+            ViewManager.Show<MatchingCompetitionRankView>();
+        }
+        private void OnClickBtnExchange()
+        {
+            if(isCountTime)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("刷新冷却中,请耐心等待!");
+                return;
+            }
+            isCountTime = true;
+            _ui.m_countTime.visible = true;
+            _ui.m_countTime.fillAmount = 1.0f;
+            Timers.inst.AddUpdate(UpdateCountTime);
+        }
+        private void OnClickBtnLook()
+        {
+
+        }
+    }
+}

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

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

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

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MatchingCompetition;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class MatchingCompetitionWorksListView : BaseWindow
+    {
+        private UI_MatchingCompetitionWorkListUI _ui;
+        private int _seasonIndex = 0;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MatchingCompetitionWorkListUI.PACKAGE_NAME;
+            _ui = UI_MatchingCompetitionWorkListUI.Create();
+            this.viewCom = _ui.target;
+            isReturnView = true;
+            isfullScreen = true;
+
+            _ui.m_workList.itemRenderer = RenderRankList;
+            _ui.m_BtnBack.onClick.Add(OnClickBtnBack);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _seasonIndex = (int)this.viewData;
+            UpdateView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void UpdateView()
+        {
+            _ui.m_workList.numItems = 2;
+        }
+        private void RenderRankList(int index, GObject obj)
+        {
+            UI_Component6 item = UI_Component6.Proxy(obj);
+            if((index +1) >=1 && (index + 1)<=3)
+            {
+                item.m_c1.selectedIndex = index + 1;
+            }
+            else
+            {
+                item.m_c1.selectedIndex = 0;
+            }
+            UI_Component6.ProxyEnd();
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(MatchingCompetitionWorksListView).FullName);
+        }
+    }
+}

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

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

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

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MatchingCompetition;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class MatchingCompetitionWorksView : BaseWindow
+    {
+        private UI_MatchingCompetitionWorksUI _ui;
+        private int _currentIndex = 0;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MatchingCompetitionWorksUI.PACKAGE_NAME;
+            _ui = UI_MatchingCompetitionWorksUI.Create();
+            this.viewCom = _ui.target;
+            isReturnView = true;
+            isfullScreen = true;
+
+            _ui.m_worksList.itemRenderer = RenderRankList;
+            _ui.m_BtnBack.onClick.Add(OnClickBtnBack);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            UpdateView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void UpdateView()
+        {
+            _ui.m_worksList.numItems = 4;
+        }
+        private void RenderRankList(int index, GObject obj)
+        {
+            UI_Component5 item = UI_Component5.Proxy(obj);
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnClickBtnItem);
+            }
+            item.target.data = index;
+            UI_Component5.ProxyEnd();
+        }
+        private void OnClickBtnItem(EventContext context)
+        {
+            GObject item = context.sender as GObject;
+            int index = (int)item.data +1;
+            ViewManager.Show<MatchingCompetitionWorksListView>(index);
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(MatchingCompetitionWorksView).FullName);
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs

@@ -32,6 +32,8 @@ namespace GFGGame
         //当前点击id信息
         private int materialID;
 
+        private int propID = 3000020;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -56,7 +58,7 @@ namespace GFGGame
             _ui.m_shopBtn.onClick.Add(ShowShopBtn);
             _ui.m_sellBtn.target.onClick.Add(OnClickSellBtn);
             _ui.target.onClick.Add(OnClickHideTips);
-
+            _ui.m_btnProp.target.onClick.Add(OnItemTips);
         }
         protected override void OnShown()
         {
@@ -65,6 +67,7 @@ namespace GFGGame
             UpdateView();
             UpdateList();
             UpdateTask();
+            UpdateItemData();
         }
         protected override void OnHide()
         {
@@ -80,6 +83,10 @@ namespace GFGGame
             itemList.Clear();
             base.OnHide();
         }
+        private void UpdateData()
+        {
+
+        }
         private void UpdateView()
         {
             itemNum = 5;
@@ -536,5 +543,24 @@ namespace GFGGame
         {
             ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
         }
+        private void UpdateItemData()
+        { 
+            ItemCfg itemcfg = ItemCfgArray.Instance.GetCfg(propID);
+            _ui.m_btnProp.target.icon = ResPathUtil.GetIconPath(itemcfg.res,"png");
+            ItemData item;
+            if (BagDataManager.Instance.GetBagData().TryGetValue(propID, out item))
+            {
+                _ui.m_btnProp.target.title = item.num.ToString();
+            }
+            else
+            {
+                _ui.m_btnProp.target.title = "0";
+            }
+        }
+        private void OnItemTips()
+        {
+            object[] sourceDatas = new object[] { propID, null };
+            GoodsItemTipsController.ShowItemTips(propID, sourceDatas);
+        }
     }
 }

GameClient/Assets/ResIn/UI/MatchingCompetition.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 81881996cb3baa048a96db8d02429e17
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 5709b09cb557c2945934d0c62640e303
+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.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 8478eead590661b46b95444d02f0003c
+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_1!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: b9d793efc9bce9741bc9879428ee82ef
+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_1.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 1ead7b340144f1c4d8d3e2e0e2f91aed
+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_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 53a126ddb99df5546a34a442912672e9
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: