Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client into HEAD

# Conflicts:
#	GameClient/Assets/Game/CSShare
#	GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRewardView.cs
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

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

@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
@@ -9,7 +6,7 @@ namespace GFGGame
     {
         private UI_SuitRewardUI _ui;
         private int _suitId;
-        private List<SuitFosterCfg> _rewardsList;
+        private string[] stageNames = { "浆洗", "晾晒", "熏香", "熨烫", "整饬" };
 
         public override void Dispose()
         {
@@ -27,15 +24,14 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
 
-            _ui.m_listReward.itemRenderer = ListRewardRender;
+            _ui.m_listReward.itemRenderer = ListRewardRecder;
         }
 
         protected override void OnShown()
         {
             base.OnShown();
             _suitId = (int)this.viewData;
-            _rewardsList = SuitFosterDataManager.Instance.GetSuitFosterRewards(_suitId);
-            _ui.m_listReward.numItems = _rewardsList.Count;
+            _ui.m_listReward.numItems = SuitFosterCfgArray.Instance.GetCfgs(_suitId).Length;
         }
 
         protected override void OnHide()
@@ -43,21 +39,20 @@ namespace GFGGame
             base.OnHide();
         }
 
-        private void ListRewardRender(int index, GObject obj)
+        private void ListRewardRecder(int index, GObject obj)
         {
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
-            SuitFosterCfg cfg = _rewardsList[index];
-            SuitFosterCfg[] cfgs = SuitFosterCfgArray.Instance.GetCfgs(_suitId);
-            int _index = Array.IndexOf(cfgs, cfg);
-            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_imgGot.visible = SuitFosterDataManager.Instance.GetRewardState(_suitId, _index + 1);
-            if (item.m_ComReward.target.data == null)
-            {
-                item.m_ComReward.target.onClick.Add(() => { GoodsItemTipsController.ShowItemTips(cfg.rewardsArr[0][0]); });
-            }
+            SuitFosterCfg cfg = SuitFosterCfgArray.Instance.GetCfgs(_suitId)[index];
+            item.m_txtDiscribe.text = string.Format("完成套装{0}获得", stageNames[index]);
+            ItemData itemData = new ItemData();
+            //itemData.id = cfg.rewardId;
+            //itemData.num = cfg.rewardNum;
+            //if (obj.data == null)
+            //{
+            //    obj.data = new ItemView(item.m_ComReward);
+            //}
+            //(obj.data as ItemView).SetData(itemData);
+            // (obj.data as ItemView).ImgGotVisible = data.isGet == 1 ? true : false;
         }
     }
 }