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

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -141,7 +141,8 @@ namespace GFGGame
                 if (objs.Length > 2 && objs[2] != null)
                 {
                     _selectedItemId = (int)objs[2];//从物品来源面板跳转到商店，需要物品id方便打开界面时做选中处理
-                    _selectedItemCount = (int)objs[3];
+                    long selectedItemCount = (long)objs[3];
+                    _selectedItemCount = (int)selectedItemCount;
                     ShopCfg[] dataArray = ClothingShopCfgManager.Instance.GetShopCfgs(_storeId);
                     for (int i = 0; i < dataArray.Length; i++)
                     {

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

@@ -45,8 +45,9 @@ namespace GFGGame
             _viewData = viewData;
             _itemId = (int)viewData[0];
             _fromeViewDatas = viewData[1] as object[];
-            _needCount = viewData.Length > 2 ? (int)viewData[2] : 0;
-            // _ui.m_list.onClickItem.Add(OnClickListApproachItem);
+            // _needCount = viewData.Length > 2 ? (int)viewData[2] : 0;
+            long needCount = viewData.Length > 2 ? (long)viewData[2] : 0;
+            _needCount = (int)needCount;
 
             SetData();
             UpdateView();