item改成通用之后，各个界面样式修改

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

@@ -11,6 +11,7 @@ namespace UI.CommonGame
         public Controller m_ScaleType;
         public GLoader m_bg;
         public GLoader m_loaIcon;
+        public GImage m_imgNum;
         public GTextField m_txtCount;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
@@ -69,6 +70,7 @@ namespace UI.CommonGame
             m_ScaleType = comp.GetController("ScaleType");
             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");
@@ -83,6 +85,7 @@ namespace UI.CommonGame
             m_ScaleType = null;
             m_bg = null;
             m_loaIcon = null;
+            m_imgNum = null;
             m_txtCount = null;
             m_txtHasCount = null;
             m_loaRarity = null;

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

@@ -1,89 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComIcon002
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        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://eg2y0ldpqik1tlz";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComIcon002";
-        private static UI_ComIcon002 _proxy;
-
-        public static UI_ComIcon002 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComIcon002();
-            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_ComIcon002 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComIcon002();
-            }
-            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            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_loaIcon = 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_ComIcon002.cs.meta

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

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

@@ -1,89 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComIcon003
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        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://eg2y0ldpvolstnd";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComIcon003";
-        private static UI_ComIcon003 _proxy;
-
-        public static UI_ComIcon003 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComIcon003();
-            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_ComIcon003 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComIcon003();
-            }
-            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            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_loaIcon = 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_ComIcon003.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.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_ComItem002
-    {
-        public GComponent target;
-        public UI_ComIcon002 m_comItemIcon;
-        public GTextField m_txtName;
-        public GTextField m_txtCount;
-        public const string URL = "ui://eg2y0ldpqik1tly";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem002";
-        private static UI_ComItem002 _proxy;
-
-        public static UI_ComItem002 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComItem002();
-            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_ComItem002 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComItem002();
-            }
-            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_ComIcon002)UI_ComIcon002.Create(comp.GetChild("comItemIcon"));
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comItemIcon.Dispose();
-            m_comItemIcon = null;
-            m_txtName = null;
-            m_txtCount = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem003.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_ComItem003
-    {
-        public GComponent target;
-        public UI_ComIcon003 m_comItemIcon;
-        public GTextField m_txtName;
-        public GTextField m_txtCount;
-        public const string URL = "ui://eg2y0ldpvolstnh";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem003";
-        private static UI_ComItem003 _proxy;
-
-        public static UI_ComItem003 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComItem003();
-            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_ComItem003 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComItem003();
-            }
-            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_ComIcon003)UI_ComIcon003.Create(comp.GetChild("comItemIcon"));
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comItemIcon.Dispose();
-            m_comItemIcon = null;
-            m_txtName = null;
-            m_txtCount = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs

@@ -129,8 +129,8 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).SetComItemScale = 0.7f;
-            (obj.data as ItemView).SetTxtCountPos(185, 155);
+            //(obj.data as ItemView).SetComItemScale = 0.7f;
+            //(obj.data as ItemView).SetTxtCountPos(185, 155);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Card/CardStarRewardView.cs

@@ -85,8 +85,8 @@ namespace GFGGame
                 item.m_comItem.data = new ItemView(item.m_comItem);
             }
             (item.m_comItem.data as ItemView).SetData(reward);
-            (item.m_comItem.data as ItemView).SetComItemScale = 0.65f;
-            (item.m_comItem.data as ItemView).SetTxtCountPos(185, 140);
+            //(item.m_comItem.data as ItemView).SetComItemScale = 0.65f;
+            //(item.m_comItem.data as ItemView).SetTxtCountPos(185, 140);
 
 
 

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

@@ -18,6 +18,7 @@ namespace GFGGame
         private GImage _imgNotHas;
         private GImage _imgHas;
         private GImage _imgShouTong;
+        private GImage _imgNum;
         private Controller _qualityType;
         private Controller _scaleType;
         // private GGroup _grpCount;
@@ -40,6 +41,7 @@ namespace GFGGame
             _imgNotHas = _item.GetChild("imgNotHas") as GImage;
             _imgHas = _item.GetChild("imgHas") as GImage;
             _imgShouTong = _item.GetChild("imgShowTong") as GImage;
+            _imgNum = _item.GetChild("imgNum") as GImage;
             _qualityType = _item.GetController("QualityType") as Controller;
             _scaleType = _item.GetController("ScaleType") as Controller;
             // _grpCount = obj.GetChild("grpCount") as GGroup;
@@ -83,6 +85,7 @@ namespace GFGGame
             // _grpCount.visible = true;
             _showTips = true;
             _txtCount.visible = true;
+            _imgNum.visible = true;
 
             _txtName.text = itemCfg.name;
             _txtCount.text = string.Format("{0}", _itemData.num);
@@ -91,7 +94,7 @@ namespace GFGGame
             if(itemCfg.rarity > 0)
                 _qualityType.selectedIndex = itemCfg.rarity - 1;
 
-           _scaleType.selectedIndex = _textScale ? 1 : 0;
+            _scaleType.selectedIndex = _textScale ? 1 : 0;
         }
 
 
@@ -243,6 +246,13 @@ namespace GFGGame
                 _txtCount.SetScale(value, value);
             }
         }
+        public float SetTxtNameScale
+        {
+            set
+            {
+                _txtName.SetScale(value, value);
+            }
+        }
         public void SetTxtCountPos(int x, int y)
         {
             _txtCount.SetPosition(x, y, 0);
@@ -252,6 +262,7 @@ namespace GFGGame
             set
             {
                 _txtCount.visible = value;
+                _imgNum.visible = value;
             }
         }
         public void ChangeTxtCountStyle()

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -213,9 +213,10 @@ namespace GFGGame
             }
             (item.data as ItemView).SetData(itemData);
             (item.data as ItemView).ShowName = true;
-            (item.data as ItemView).SetComItemScale = 0.8f;
-            (item.data as ItemView).SetTxtCountPos(210, 160);
-            (item.data as ItemView).SetTxtNamePos(110, 200);
+            //(item.data as ItemView).SetComItemScale = 0.8f;
+            (item.data as ItemView).SetTxtNameScale = 1.2f;
+            //(item.data as ItemView).SetTxtCountPos(210, 160);
+            //(item.data as ItemView).SetTxtNamePos(110, 200);
             // (item.data as ItemView).ShowHasCount = false;
         }
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs

@@ -86,8 +86,8 @@ namespace GFGGame
             }
             (obj.data as ItemView).SetData(reward);
             (obj.data as ItemView).GrpGotVisible = StudioDataManager.Instance.GetFilingRewardStateByIndex(StudioDataManager.Instance.filingChapterId, rewardIndex) == ConstBonusStatus.GOT ? true : false;
-            (obj.data as ItemView).SetComItemScale = 0.6f;
-            (obj.data as ItemView).SetTxtCountPos(175, 135);
+            //(obj.data as ItemView).SetComItemScale = 0.6f;
+            //(obj.data as ItemView).SetTxtCountPos(175, 135);
         }
 
         private void OnBtnGetClcik()