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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideDetailUI.cs

@@ -9,7 +9,7 @@ namespace UI.FieldGuide
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GList m_listSuit;
+        public UI_listSuitCom m_listSuitCom;
         public GTextField m_title;
         public GButton m_btnSearch;
         public UI_ProgressBar4 m_progress;
@@ -64,7 +64,7 @@ namespace UI.FieldGuide
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_listSuit = (GList)comp.GetChild("listSuit");
+            m_listSuitCom = (UI_listSuitCom)UI_listSuitCom.Create(comp.GetChild("listSuitCom"));
             m_title = (GTextField)comp.GetChild("title");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_progress = (UI_ProgressBar4)UI_ProgressBar4.Create(comp.GetChild("progress"));
@@ -75,7 +75,8 @@ namespace UI.FieldGuide
         {
             m_loaBg = null;
             m_btnBack = null;
-            m_listSuit = null;
+            m_listSuitCom.Dispose();
+            m_listSuitCom = null;
             m_title = null;
             m_btnSearch = null;
             m_progress.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_listSuitCom.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_listSuitCom
+    {
+        public GComponent target;
+        public GList m_listSuit;
+        public const string URL = "ui://vqq9h9h4h6457o";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "listSuitCom";
+        private static UI_listSuitCom _proxy;
+
+        public static UI_listSuitCom Create(GObject gObject = null)
+        {
+            var ui = new UI_listSuitCom();
+            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_listSuitCom Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_listSuitCom();
+            }
+            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_listSuit = (GList)comp.GetChild("listSuit");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listSuit = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_listSuitCom.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

@@ -41,7 +41,7 @@ namespace GFGGame
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
 
-            _ui.m_listSuit.itemRenderer = RenderListSuitItem;
+            _ui.m_listSuitCom.m_listSuit.itemRenderer = RenderListSuitItem;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
         }
@@ -103,7 +103,7 @@ namespace GFGGame
             }
 
             ViewManager.Hide<ModalStatusView>();
-            _ui.m_listSuit.numItems = _suitIds.Count;
+            _ui.m_listSuitCom.m_listSuit.numItems = _suitIds.Count;
             UpdateProgress();
             _ui.m_Refresh.Play();
 
@@ -143,8 +143,15 @@ namespace GFGGame
                 _ui.m_progress.m_rate.SetVar("rate", "0").FlushVars();
             }
 
-            _ui.m_listSuit.numItems = _suitIds.Count;
-            _ui.m_listSuit.scrollPane.ScrollTop();
+
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+            _effectUIDic.Clear();
+
+            _ui.m_listSuitCom.m_listSuit.numItems = _suitIds.Count;
+            _ui.m_listSuitCom.m_listSuit.scrollPane.ScrollTop();
         }
 
         private void RenderListSuitItem(int index, GObject item)
@@ -178,10 +185,10 @@ namespace GFGGame
 
         private void UpdateSuitStatus(EventContext eventContext)
         {
-            int num = _ui.m_listSuit.numChildren;
+            int num = _ui.m_listSuitCom.m_listSuit.numChildren;
             for (int i = 0; i < num; i++)
             {
-                UI_CompSuitItem listItem = UI_CompSuitItem.Proxy(_ui.m_listSuit.GetChildAt(i));
+                UI_CompSuitItem listItem = UI_CompSuitItem.Proxy(_ui.m_listSuitCom.m_listSuit.GetChildAt(i));
                 UpdateSuitStatusView(listItem);
                 UI_CompSuitItem.ProxyEnd();
             }