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

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

GameClient/Assets/Game/HotUpdate/Data/FunctionOpenDataManager.cs

@@ -220,7 +220,7 @@ namespace GFGGame
             {
                 if (cfg.id == typeof(ClothingListView).Name)//服装升级获取第一套【天衣】套装后开启
                 {
-                    strTips = string.Format("收集一套'天衣'套装后解锁");
+                    strTips = string.Format("收集一套“天衣”套装后解锁");
                 }
             }
             return strTips;

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -294,7 +294,7 @@ namespace GFGGame
             else
             {
                 FriendInfoData friendInfoData = FriendDataManager.Instance.GetFriendDataById(_friendRoleId);
-                ViewManager.Show<OtherRoleInfoView>(new object[] { friendInfoData.roleInfo }, new object[] { typeof(FriendView).FullName, _friendRoleId });
+                ViewManager.Show<OtherRoleInfoView>(new object[] { friendInfoData.roleInfo, friendInfoData.roleDetailInfo }, new object[] { typeof(FriendView).FullName, _friendRoleId });
             }
         }
         private void OnBtnAddClick()

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -58,7 +58,7 @@ namespace GFGGame
         // private List<PoemGalleryData> _galleryDatas = new List<PoemGalleryData>();
         private List<long> _galleryDatas = new List<long>();
         private int _sortType = 0;//由GallerySortType定义
-        private int _pageCount = 4;
+        private int _pageCount = 10;
         private int _lastListCount = 0;
         private int _lastList1Count = 0;
         private int _lastGalleryDatasCount = 0;

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -52,10 +52,10 @@ namespace GFGGame
             _ui.m_txtLvl.text = _roleInfo.roleLv.ToString();
             RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId);
 
-            OtherRoleInfoDetailData roleInfoDetail = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_roleInfo.roleId);
-            if (roleInfoDetail != null)
+            _roleDetailInfo = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_roleInfo.roleId);
+            if (_roleDetailInfo != null)
             {
-                Timers.inst.StartCoroutine(PictureStorageHelper.Download(roleInfoDetail.showPhotoList));
+                Timers.inst.StartCoroutine(PictureStorageHelper.Download(_roleDetailInfo.showPhotoList));
             }
         }