服装分解换ui，item改用通用item

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingDecompose
+{
+    public partial class UI_Button6
+    {
+        public GButton target;
+        public Controller m_type;
+        public const string URL = "ui://h9mv1l71ns6n17";
+        public const string PACKAGE_NAME = "ClothingDecompose";
+        public const string RES_NAME = "Button6";
+        private static UI_Button6 _proxy;
+
+        public static UI_Button6 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button6();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button6 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button6();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_type = comp.GetController("type");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_type = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListRewardItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingDecompose/UI_Button6.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4c997328fc4c1c04586b0f54d2194694
+guid: 6a856a2178865214eb5544f6ead343ef
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -8,7 +8,7 @@ namespace UI.ClothingDecompose
     {
         public GComponent target;
         public Controller m_c1;
-        public GImage m_bg;
+        public GLoader m_bg;
         public GComponent m_valueBar;
         public GButton m_btnBack;
         public GButton m_btnRule;
@@ -69,7 +69,7 @@ namespace UI.ClothingDecompose
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_bg = (GImage)comp.GetChild("bg");
+            m_bg = (GLoader)comp.GetChild("bg");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnRule = (GButton)comp.GetChild("btnRule");

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingDecompose/UI_ListItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs

@@ -2,28 +2,34 @@
 
 using FairyGUI;
 
-namespace UI.ClothingDecompose
+namespace UI.CommonGame
 {
-    public partial class UI_ListItem
+    public partial class UI_ComItem
     {
         public GComponent target;
-        public Controller m_button;
+        public Controller m_QualityType;
+        public Controller m_ItemType;
+        public Controller m_ViewType;
+        public Controller m_TouchType;
         public GImage m_imgSelect;
-        public GLoader m_loaItem;
+        public GLoader m_loaBg;
         public GLoader m_loaIcon;
-        public GLoader m_loaRarity;
-        public GTextField m_txtName;
         public GTextField m_txtCount;
-        public GTextField m_txtHasCount;
+        public GTextField m_txtName;
+        public GImage m_imgOnceBonus;
+        public GLoader m_loaRarity;
+        public GGraph m_holderReware;
         public GButton m_btnMinus;
-        public const string URL = "ui://h9mv1l71hvn0a";
-        public const string PACKAGE_NAME = "ClothingDecompose";
-        public const string RES_NAME = "ListItem";
-        private static UI_ListItem _proxy;
+        public GTextField m_txtDecomHasCount;
+        public GTextField m_txtDecomCount;
+        public const string URL = "ui://eg2y0ldpwet2tae";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItem";
+        private static UI_ComItem _proxy;
 
-        public static UI_ListItem Create(GObject gObject = null)
+        public static UI_ComItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListItem();
+            var ui = new UI_ComItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -32,11 +38,11 @@ namespace UI.ClothingDecompose
             return ui;
         }
 
-        public static UI_ListItem Proxy(GObject gObject = null)
+        public static UI_ComItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListItem();
+                _proxy = new UI_ComItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -63,27 +69,39 @@ namespace UI.ClothingDecompose
 
         private void Init(GComponent comp)
         {
-            m_button = comp.GetController("button");
+            m_QualityType = comp.GetController("QualityType");
+            m_ItemType = comp.GetController("ItemType");
+            m_ViewType = comp.GetController("ViewType");
+            m_TouchType = comp.GetController("TouchType");
             m_imgSelect = (GImage)comp.GetChild("imgSelect");
-            m_loaItem = (GLoader)comp.GetChild("loaItem");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_imgOnceBonus = (GImage)comp.GetChild("imgOnceBonus");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_holderReware = (GGraph)comp.GetChild("holderReware");
             m_btnMinus = (GButton)comp.GetChild("btnMinus");
+            m_txtDecomHasCount = (GTextField)comp.GetChild("txtDecomHasCount");
+            m_txtDecomCount = (GTextField)comp.GetChild("txtDecomCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_button = null;
+            m_QualityType = null;
+            m_ItemType = null;
+            m_ViewType = null;
+            m_TouchType = null;
             m_imgSelect = null;
-            m_loaItem = null;
+            m_loaBg = null;
             m_loaIcon = null;
-            m_loaRarity = null;
-            m_txtName = null;
             m_txtCount = null;
-            m_txtHasCount = null;
+            m_txtName = null;
+            m_imgOnceBonus = null;
+            m_loaRarity = null;
+            m_holderReware = null;
             m_btnMinus = null;
+            m_txtDecomHasCount = null;
+            m_txtDecomCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingDecompose/UI_ListItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 100b5f49360f5c94580ddf2d879cacdf
+guid: 02914f6fbec2bf6408e724e0c05161f3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComRewardItem
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtCount;
-        public GTextField m_txtName;
-        public GImage m_imgOnceBonus;
-        public const string URL = "ui://eg2y0ldpwet2tae";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComRewardItem";
-        private static UI_ComRewardItem _proxy;
-
-        public static UI_ComRewardItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ComRewardItem();
-            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_ComRewardItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComRewardItem();
-            }
-            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_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_imgOnceBonus = (GImage)comp.GetChild("imgOnceBonus");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_txtCount = null;
-            m_txtName = null;
-            m_imgOnceBonus = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListRewardItem.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_ListRewardItem
-    {
-        public GComponent target;
-        public UI_ComRewardItem m_comRewardItem;
-        public GGraph m_holderReware;
-        public const string URL = "ui://eg2y0ldpm9wm8u";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ListRewardItem";
-        private static UI_ListRewardItem _proxy;
-
-        public static UI_ListRewardItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListRewardItem();
-            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_ListRewardItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListRewardItem();
-            }
-            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_comRewardItem = (UI_ComRewardItem)UI_ComRewardItem.Create(comp.GetChild("comRewardItem"));
-            m_holderReware = (GGraph)comp.GetChild("holderReware");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comRewardItem.Dispose();
-            m_comRewardItem = null;
-            m_holderReware = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs

@@ -150,7 +150,7 @@ namespace GFGGame
             _ui.m_btnAdd.touchable = _count == hasCount ? false : true;
             _ui.m_btnMax.m_c1.selectedIndex = _count == hasCount ? 1 : 0;
             _ui.m_btnMax.target.touchable = _count == hasCount ? false : true;
-            _ui.m_txtExchangeCount.text = string.Format("x{0}", hasCount);
+            _ui.m_txtExchangeCount.text = string.Format("{0}", hasCount);
 
             _ui.m_txtShow.text = "选择使用数量";
             _ui.m_txtTips.text = string.Format("是否使用{0}个{1}？", _count, itemCfg.name);

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

@@ -4,6 +4,7 @@ using System.Linq;
 using ET;
 using FairyGUI;
 using UI.ClothingDecompose;
+using UI.CommonGame;
 
 namespace GFGGame
 {
@@ -33,7 +34,6 @@ namespace GFGGame
             base.Dispose();
         }
 
-
         protected override void OnInit()
         {
             base.OnInit();
@@ -46,6 +46,8 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
 
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
+
             _ui.m_listTab.onClickItem.Add((EventContext context) =>
             {
                 int index = _ui.m_listTab.GetChildIndex(context.data as GObject);
@@ -87,7 +89,6 @@ namespace GFGGame
             base.OnHide();
             _valueBarController.OnHide();
             Timers.inst.Remove(CheckGuide);
-
         }
 
         private void OnClickBtnRarity(int rarity)
@@ -96,27 +97,31 @@ namespace GFGGame
             _clothingDatas = DecomposeDataManager.Instance.GetDecomposeDataByRarity(rarity);
             _ui.m_list.visible = _clothingDatas != null && _clothingDatas.Count > 0;
             _ui.m_txtNone.visible = _clothingDatas == null || _clothingDatas.Count == 0;
-            if (_clothingDatas == null) return;
-            _ui.m_list.numItems = _clothingDatas.Count;
-            _ui.m_btnSelect.selected = false;
+            _ui.m_listReward.visible = _clothingDatas != null && _clothingDatas.Count > 0;
             CancleAll();
             UpdateConsume();
         }
-
-        private void ListItemRander(int index, GObject obj)
+              
+        private void ListItemRander(int index, GObject obj) 
         {
-            UI_ListItem item = UI_ListItem.Proxy(obj);
+            UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_clothingDatas[index]);
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
+            item.m_ViewType.selectedIndex = 1;
+            item.m_ItemType.selectedIndex = 1;
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             item.m_txtName.text = itemCfg.name;
-            item.m_imgSelect.visible = false;
             long itemHasCount = DecomposeDataManager.Instance.ItemCanDecomposeCount(itemCfg.id);
-            item.m_txtHasCount.text = itemHasCount.ToString();
             long itemCount = _decomposeData.ContainsKey(_clothingDatas[index]) ? _decomposeData[_clothingDatas[index]] : 0;
-            item.m_txtCount.text = itemCount.ToString();
-            item.m_imgSelect.visible = itemCount > 0;
+            item.m_txtDecomHasCount.text ="/" + itemHasCount;
+            item.m_txtDecomCount.text = itemCount.ToString();
+
+            if (itemCount > 0)
+                item.m_TouchType.selectedIndex = 1;
+            else
+                item.m_TouchType.selectedIndex = 0;
+
             item.m_btnMinus.visible = itemCount > 0;
             if (item.m_btnMinus.data == null)
             {
@@ -124,14 +129,14 @@ namespace GFGGame
             }
             item.m_btnMinus.data = index;
 
-            if (item.m_loaItem.data == null)
+            if (item.m_loaBg.data == null)
             {
-                item.m_loaItem.onClick.Add(OnListItemClick);
+                item.m_loaBg.onClick.Add(OnListItemClick);
 
             }
-            item.m_loaItem.data = index;
+            item.m_loaBg.data = index;
             item.target.data = itemCfg;
-            UI_ListItem.ProxyEnd();
+            UI_ComItem.ProxyEnd();
         }
         private void OnListItemClick(EventContext context)
         {
@@ -153,16 +158,15 @@ namespace GFGGame
             //     return;
             // }
 
-            UI_ListItem item = UI_ListItem.Proxy(com);
+            UI_ComItem item = UI_ComItem.Proxy(com);
             item.m_btnMinus.visible = true;
-            item.m_imgSelect.visible = true;
+            item.m_TouchType.selectedIndex = 1;
 
             _decomposeData[itemId] = _decomposeData[itemId] + 1;
             _decomposeCount += 1;
-            item.m_txtCount.text = _decomposeData[itemId].ToString();
-            UI_ListItem.ProxyEnd();
+            item.m_txtDecomCount.text = _decomposeData[itemId].ToString();
+            UI_ComItem.ProxyEnd();
             UpdateConsume();
-
         }
 
         private void OnClickBtnMinus(EventContext context)
@@ -170,23 +174,21 @@ namespace GFGGame
             int index = (int)((context.sender as GButton).data);
             int childIndex = _ui.m_list.ItemIndexToChildIndex(index);
             GComponent com = _ui.m_list.GetChildAt(childIndex).asCom;
-            UI_ListItem item = UI_ListItem.Proxy(com);
-
+            UI_ComItem item = UI_ComItem.Proxy(com);
 
             int itemId = (com.data as ItemCfg).id;
 
             _decomposeData[itemId] = _decomposeData[itemId] - 1;
             _decomposeCount -= 1;
-            item.m_txtCount.text = _decomposeData[itemId].ToString();
+            item.m_txtDecomCount.text = _decomposeData[itemId].ToString();
             if (_decomposeData[itemId] == 0)
             {
                 _decomposeData.Remove(itemId);
-                item.m_imgSelect.visible = false;
+                item.m_TouchType.selectedIndex = 0;
                 item.m_btnMinus.visible = false;
             }
-            UI_ListItem.ProxyEnd();
+            UI_ComItem.ProxyEnd();
             UpdateConsume();
-
         }
 
         private void OnClickBtnSelect()
@@ -203,6 +205,9 @@ namespace GFGGame
         }
         private void SelectAll()
         {
+            if (_clothingDatas == null)
+                return;
+
             long lastCount = DecomposeDataManager.MaxCount - _decomposeCount;
 
             for (int i = 0; i < _clothingDatas.Count; i++)
@@ -224,17 +229,17 @@ namespace GFGGame
             }
             _ui.m_list.numItems = _clothingDatas.Count;
         }
+
         private void CancleAll()
         {
-            _decomposeData.Clear();
-            _ui.m_list.numItems = _clothingDatas.Count;
             _decomposeCount = 0;
-
+            _decomposeData.Clear();
+            if (_clothingDatas != null)
+                _ui.m_list.numItems = _clothingDatas.Count;
         }
 
         private void UpdateConsume()
         {
-
             DecomposeCfg cfg = DecomposeCfgArray.Instance.GetCfg(_curRarity);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.consumeId);
             _ui.m_listReward.numItems = _decomposeCount > 0 ? cfg.itemsArr.Length : 0;
@@ -300,7 +305,6 @@ namespace GFGGame
             {
                 OnClickBtnRarity(_curRarity);
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_FEN_JIE, 2);
-
             }
         }
         private void OnClickBtnRule()
@@ -335,7 +339,6 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 5, "分解获得的材料可用于新服饰合成。");
             GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_DECOMPOSE, 5);
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 1, "回到绣坊界面。");
-
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs

@@ -56,7 +56,7 @@ namespace GFGGame
             item.m_txtDiscribe.text = string.Format("完成套装{0}获得", SuitFosterDataManager.Instance.stepNames[_index]);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.rewardsArr[0][0]);
             item.m_ComReward.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-            item.m_ComReward.m_txtNum.text = string.Format("x{0}", cfg.rewardsArr[0][1]);
+            item.m_ComReward.m_txtNum.text = string.Format("{0}", cfg.rewardsArr[0][1]);
             item.m_ComReward.m_imgGot.visible = SuitFosterDataManager.Instance.GetRewardState(_suitId, _index + 1);
             if (item.m_ComReward.target.data == null)
             {

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

@@ -80,7 +80,7 @@ namespace GFGGame
             _txtCount.visible = true;
 
             _txtName.text = itemCfg.name;
-            _txtCount.text = string.Format("x{0}", _itemData.num);
+            _txtCount.text = string.Format("{0}", _itemData.num);
             _txtHasCount.SetVar("count", "" + ItemDataManager.GetItemNum(_itemData.id)).FlushVars();
         }
 

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

@@ -132,7 +132,7 @@ namespace GFGGame
         private void RenderListRewardItem(int index, GObject obj)
         {
             // obj.data = _listItemDatas[index];
-            UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
+            UI_ComItem item = UI_ComItem.Proxy(obj);
             string name = "";
             string iconRes = "";
             string ext = "png";
@@ -152,26 +152,26 @@ namespace GFGGame
                 iconRes = itemCfg.res;
             }
 
-            item.m_comRewardItem.m_txtName.text = name;
-            // item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("x{0}", _listItemDatas[index].num);
-            item.m_comRewardItem.m_txtCount.text = string.Format("x{0}", _listItemDatas[index].num);
-            item.m_comRewardItem.m_loaIcon.url = ResPathUtil.GetIconPath(iconRes, ext);
+            item.m_txtName.text = name;
+            // item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("{0}", _listItemDatas[index].num);
+            item.m_txtCount.text = string.Format("{0}", _listItemDatas[index].num);
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(iconRes, ext);
 
-            item.m_comRewardItem.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
+            item.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
             //特效("ui_ck", "ui_ck_zl");
             int childIndex = _ui.m_comList.m_listReward.ItemIndexToChildIndex(index);
             if (_effects.Count <= childIndex)
             {
-                EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderReware, "ui_hd", "GXHD_WuPin");
+                EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderReware, "ui_hd", "GXHD_WuPin",120);
                 _effects.Add(_effectUI);
             }
 
-            if (item.m_comRewardItem.target.data == null)
+            if (item.target.data == null)
             {
-                item.m_comRewardItem.target.onClick.Add(OnClickListReward);
+                item.target.onClick.Add(OnClickListReward);
             }
-            item.m_comRewardItem.target.data = _listItemDatas[index];
-            UI_ListRewardItem.ProxyEnd();
+            item.target.data = _listItemDatas[index];
+            UI_ComItem.ProxyEnd();
         }
 
         private void OnClickListReward(EventContext context)
@@ -183,7 +183,6 @@ namespace GFGGame
             }
         }
 
-
         private bool _showTips = true;
         /// <summary>
         /// 是否展示物品详情，默认展示
@@ -193,6 +192,5 @@ namespace GFGGame
             get { return _showTips; }
             set { _showTips = value; }
         }
-
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -140,9 +140,9 @@ namespace GFGGame
             FieldCfg selectCfg1 = FieldCfgArray.Instance.dataArray[1];
             FieldCfg selectCfg2 = FieldCfgArray.Instance.dataArray[2];
 
-            _ui.m_btn0.m_txtConsume.text = string.Format("x{0}", selectCfg0.needPower);
-            _ui.m_btn1.m_txtConsume.text = string.Format("x{0}", selectCfg1.needPower);
-            _ui.m_btn2.m_txtConsume.text = string.Format("x{0}", selectCfg2.needPower);
+            _ui.m_btn0.m_txtConsume.text = string.Format("{0}", selectCfg0.needPower);
+            _ui.m_btn1.m_txtConsume.text = string.Format("{0}", selectCfg1.needPower);
+            _ui.m_btn2.m_txtConsume.text = string.Format("{0}", selectCfg2.needPower);
 
             bool isPass0 = selectCfg0.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg0.storyLvId);
             bool isPass1 = selectCfg1.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg1.storyLvId);

GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs

@@ -145,7 +145,7 @@ namespace GFGGame
         }
         private void UpdateView()
         {
-            _ui.m_txtExchangeCount.text = string.Format("x{0}", _shopCfg.itemNum * _buyCount);
+            _ui.m_txtExchangeCount.text = string.Format("{0}", _shopCfg.itemNum * _buyCount);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_shopCfg.itemId);
             _ui.m_txtCostCount.text = _buyCount.ToString();
             _ui.m_btnMinus.m_c1.selectedIndex = _buyCount == 1 ? 1 : 0;