item合并成通用

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs

@@ -1,101 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComIcon001
-    {
-        public GComponent target;
-        public Controller m_QualityType;
-        public GLoader m_bg;
-        public GLoader m_loaIcon;
-        public GImage m_imgNum;
-        public GTextField m_txtCount;
-        public GTextField m_txtHasCount;
-        public GLoader m_loaRarity;
-        public GImage m_imgHas;
-        public GImage m_imgNotHas;
-        public GImage m_imgShowTong;
-        public GGroup m_grpGot;
-        public const string URL = "ui://eg2y0ldp9jv6tlt";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComIcon001";
-        private static UI_ComIcon001 _proxy;
-
-        public static UI_ComIcon001 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComIcon001();
-            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_ComIcon001 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComIcon001();
-            }
-            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_QualityType = comp.GetController("QualityType");
-            m_bg = (GLoader)comp.GetChild("bg");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_imgNum = (GImage)comp.GetChild("imgNum");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_imgHas = (GImage)comp.GetChild("imgHas");
-            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
-            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
-            m_grpGot = (GGroup)comp.GetChild("grpGot");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_QualityType = null;
-            m_bg = null;
-            m_loaIcon = null;
-            m_imgNum = null;
-            m_txtCount = null;
-            m_txtHasCount = null;
-            m_loaRarity = null;
-            m_imgHas = null;
-            m_imgNotHas = null;
-            m_imgShowTong = null;
-            m_grpGot = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta

@@ -1,15 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta
-guid: baea59a7a552059409d451a9a60dd358
-=======
-guid: 4ad5e828cb8d0004488ba34ffb26c6e0
->>>>>>> remotes/origin/master:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs

@@ -11,17 +11,23 @@ namespace UI.CommonGame
         public Controller m_ViewType;
         public Controller m_TouchType;
         public Controller m_NewType;
+        public Controller m_ShowName;
         public GImage m_imgSelect;
         public GLoader m_loaBg;
         public GLoader m_loaIcon;
         public GImage m_imgOnceBonus;
         public GLoader m_loaRarity;
         public GGraph m_holderReware;
+        public GImage m_imgNum;
         public GTextField m_txtCount;
-        public GTextField m_txtName;
         public GButton m_btnMinus;
         public GTextField m_txtDecomHasCount;
         public GTextField m_txtDecomCount;
+        public GTextField m_txtName;
+        public GImage m_imgHas;
+        public GImage m_imgNotHas;
+        public GImage m_imgShowTong;
+        public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpwet2tae";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComItem";
@@ -73,17 +79,23 @@ namespace UI.CommonGame
             m_ViewType = comp.GetController("ViewType");
             m_TouchType = comp.GetController("TouchType");
             m_NewType = comp.GetController("NewType");
+            m_ShowName = comp.GetController("ShowName");
             m_imgSelect = (GImage)comp.GetChild("imgSelect");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_imgOnceBonus = (GImage)comp.GetChild("imgOnceBonus");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_holderReware = (GGraph)comp.GetChild("holderReware");
+            m_imgNum = (GImage)comp.GetChild("imgNum");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnMinus = (GButton)comp.GetChild("btnMinus");
             m_txtDecomHasCount = (GTextField)comp.GetChild("txtDecomHasCount");
             m_txtDecomCount = (GTextField)comp.GetChild("txtDecomCount");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_imgHas = (GImage)comp.GetChild("imgHas");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
+            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -91,17 +103,23 @@ namespace UI.CommonGame
             m_ViewType = null;
             m_TouchType = null;
             m_NewType = null;
+            m_ShowName = null;
             m_imgSelect = null;
             m_loaBg = null;
             m_loaIcon = null;
             m_imgOnceBonus = null;
             m_loaRarity = null;
             m_holderReware = null;
+            m_imgNum = null;
             m_txtCount = null;
-            m_txtName = null;
             m_btnMinus = null;
             m_txtDecomHasCount = null;
             m_txtDecomCount = null;
+            m_txtName = null;
+            m_imgHas = null;
+            m_imgNotHas = null;
+            m_imgShowTong = null;
+            m_grpGot = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs

@@ -7,7 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ComItem000
     {
         public GComponent target;
-        public UI_ComIcon001 m_comItemIcon;
+        public UI_ComItem m_comItemIcon;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpj48o98";
         public const string PACKAGE_NAME = "CommonGame";
@@ -56,7 +56,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComItem)UI_ComItem.Create(comp.GetChild("comItemIcon"));
             m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs

@@ -1,78 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComItem001_1
-    {
-        public GComponent target;
-        public UI_ComIcon001 m_comItemIcon;
-        public GTextField m_txtCount;
-        public GTextField m_txtName;
-        public const string URL = "ui://eg2y0ldpmdmdtn5";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem001_1";
-        private static UI_ComItem001_1 _proxy;
-
-        public static UI_ComItem001_1 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComItem001_1();
-            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_ComItem001_1 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComItem001_1();
-            }
-            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_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comItemIcon.Dispose();
-            m_comItemIcon = null;
-            m_txtCount = null;
-            m_txtName = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs

@@ -1,75 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComItem001_2
-    {
-        public GComponent target;
-        public UI_ComIcon001 m_comItemIcon;
-        public GTextField m_txtName;
-        public const string URL = "ui://eg2y0ldp9jv6tls";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem001_2";
-        private static UI_ComItem001_2 _proxy;
-
-        public static UI_ComItem001_2 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComItem001_2();
-            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_ComItem001_2 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComItem001_2();
-            }
-            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_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
-            m_txtName = (GTextField)comp.GetChild("txtName");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comItemIcon.Dispose();
-            m_comItemIcon = null;
-            m_txtName = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs.meta

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

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

@@ -128,6 +128,7 @@ namespace GFGGame
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
             item.m_ViewType.selectedIndex = 1;
+            item.m_ShowName.selectedIndex = 1;
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             item.m_txtName.text = itemCfg.name;
             long itemHasCount = DecomposeDataManager.Instance.CanDecomposeCount(_ui.m_c1.selectedIndex,itemCfg.id);

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -12,7 +12,6 @@ namespace GFGGame
         private GLoader _loaRarity;
         private GTextField _txtName;
         private GTextField _txtCount;
-        private GTextField _txtHasCount;
         // private GImage _imgGot;
         private GGroup _grpGot;
         private GImage _imgNotHas;
@@ -34,7 +33,6 @@ namespace GFGGame
             _loaRarity = _item.GetChild("loaRarity") as GLoader;
             _txtName = obj.GetChild("txtName") as GTextField;
             _txtCount = _item.GetChild("txtCount") as GTextField;
-            _txtHasCount = _item.GetChild("txtHasCount") as GTextField;
             // _imgGot = obj.GetChild("imgGot") as GImage;
             _grpGot = _item.GetChild("grpGot") as GGroup;
             _imgNotHas = _item.GetChild("imgNotHas") as GImage;
@@ -87,7 +85,6 @@ namespace GFGGame
 
             _txtName.text = itemCfg.name;
             _txtCount.text = string.Format("{0}", _itemData.num);
-            _txtHasCount.SetVar("count", "" + ItemDataManager.GetItemNum(_itemData.id)).FlushVars();
 
             if(itemCfg.rarity > 0)
                 _qualityType.selectedIndex = itemCfg.rarity - 1;
@@ -162,23 +159,6 @@ namespace GFGGame
         }
 
         /// <summary>
-        /// 显示拥有数量
-        /// </summary>
-        /// <value></value>
-        public bool ShowHasCount
-        {
-            get
-            {
-                return _txtHasCount.visible;
-            }
-            set
-            {
-                _txtHasCount.visible = value;
-            }
-        }
-
-
-        /// <summary>
         /// 显示名字
         /// </summary>
         /// <value></value>
@@ -189,6 +169,7 @@ namespace GFGGame
                 _txtName.visible = value;
             }
         }
+
         /// <summary>
         /// 显示稀有度
         /// </summary>

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

@@ -75,7 +75,6 @@ namespace GFGGame
                 itemViews.Add(itemView);
             }
             itemViews[index].SetData(reward);
-            itemViews[index].ShowHasCount = false;
             bool haveItem = DressUpMenuItemDataManager.CheckHasItem(itemId);
             itemViews[index].ImgNotGotVisible = !haveItem;
             itemViews[index].ShowTips = false;

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxPreShowView.cs

@@ -73,9 +73,7 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
                 (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).ShowHasCount = false;
             (obj.data as ItemView).ImgHasVisible = ItemDataManager.GetItemNum(itemData.id) > 0;
-
         }
     }
 }