合成补充提交

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

@@ -11,6 +11,12 @@ namespace UI.MiniGame
         public GLoader m_backBtn;
         public GComponent m_rangeTop;
         public GComponent m_rangeDown;
+        public GLoader m_afuicon;
+        public GTextField m_afuDesc;
+        public GTextField m_afunum;
+        public GLoader m_doubaoicon;
+        public GTextField m_doubaoDesc;
+        public GTextField m_doubaonum;
         public GTextField m_name;
         public GTextField m_desc;
         public GButton m_MergeTipBtn;
@@ -79,6 +85,12 @@ namespace UI.MiniGame
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_rangeTop = (GComponent)comp.GetChild("rangeTop");
             m_rangeDown = (GComponent)comp.GetChild("rangeDown");
+            m_afuicon = (GLoader)comp.GetChild("afuicon");
+            m_afuDesc = (GTextField)comp.GetChild("afuDesc");
+            m_afunum = (GTextField)comp.GetChild("afunum");
+            m_doubaoicon = (GLoader)comp.GetChild("doubaoicon");
+            m_doubaoDesc = (GTextField)comp.GetChild("doubaoDesc");
+            m_doubaonum = (GTextField)comp.GetChild("doubaonum");
             m_name = (GTextField)comp.GetChild("name");
             m_desc = (GTextField)comp.GetChild("desc");
             m_MergeTipBtn = (GButton)comp.GetChild("MergeTipBtn");
@@ -103,6 +115,12 @@ namespace UI.MiniGame
             m_backBtn = null;
             m_rangeTop = null;
             m_rangeDown = null;
+            m_afuicon = null;
+            m_afuDesc = null;
+            m_afunum = null;
+            m_doubaoicon = null;
+            m_doubaoDesc = null;
+            m_doubaonum = null;
             m_name = null;
             m_desc = null;
             m_MergeTipBtn = null;

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

@@ -136,6 +136,9 @@ namespace GFGGame
             _ui.m_name.text = "";
             _ui.m_desc.text = ""; 
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("jbnf_xyxbj");
+            ItemCfg itemcfg = ItemCfgArray.Instance.GetCfg(propID);
+            _ui.m_doubaoicon.url = ResPathUtil.GetIconPath(itemcfg.res,"png");
+            _ui.m_afuicon.url = ResPathUtil.GetIconPath(itemcfg.res, "png");
         }
         private void UpdateList()
         {