Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingDecompose/UI_ClothingDecomposeUI.cs

@@ -9,6 +9,7 @@ namespace UI.ClothingDecompose
         public GComponent target;
         public Controller m_c1;
         public Controller m_TouchSelect;
+        public Controller m_clothesType;
         public GLoader m_bg;
         public UI_Button6 m_btnClothing;
         public UI_Button6 m_btnSkillBook;
@@ -24,6 +25,7 @@ namespace UI.ClothingDecompose
         public GTextField m_txtConsume;
         public GTextField m_txtTips;
         public GButton m_btnSelect;
+        public GTextField m_txtGetRewardTips;
         public const string URL = "ui://h9mv1l71wlc20";
         public const string PACKAGE_NAME = "ClothingDecompose";
         public const string RES_NAME = "ClothingDecomposeUI";
@@ -73,6 +75,7 @@ namespace UI.ClothingDecompose
         {
             m_c1 = comp.GetController("c1");
             m_TouchSelect = comp.GetController("TouchSelect");
+            m_clothesType = comp.GetController("clothesType");
             m_bg = (GLoader)comp.GetChild("bg");
             m_btnClothing = (UI_Button6)UI_Button6.Create(comp.GetChild("btnClothing"));
             m_btnSkillBook = (UI_Button6)UI_Button6.Create(comp.GetChild("btnSkillBook"));
@@ -88,11 +91,13 @@ namespace UI.ClothingDecompose
             m_txtConsume = (GTextField)comp.GetChild("txtConsume");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_btnSelect = (GButton)comp.GetChild("btnSelect");
+            m_txtGetRewardTips = (GTextField)comp.GetChild("txtGetRewardTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_TouchSelect = null;
+            m_clothesType = null;
             m_bg = null;
             m_btnClothing.Dispose();
             m_btnClothing = null;
@@ -110,6 +115,7 @@ namespace UI.ClothingDecompose
             m_txtConsume = null;
             m_txtTips = null;
             m_btnSelect = null;
+            m_txtGetRewardTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -112,6 +112,7 @@ namespace GFGGame
         private void OnClickBtnRarity(int rarity)
         {
             _curRarity = rarity;
+            _ui.m_clothesType.selectedIndex = _curRarity - 1;
             if (_ui.m_c1.selectedIndex == 0)
                 _clothingDatas = DecomposeDataManager.Instance.GetDecomposeDataByRarity(rarity);
             else if (_ui.m_c1.selectedIndex == 1)