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

GameClient/Assets/Game/HotUpdate/ServerProxy/PictureStorageHelper.cs

@@ -54,7 +54,7 @@ namespace GFGGame
         {
             if (count >= 5)
             {
-                ET.Log.Error("PoemGalleryData Download  failed!!! data:" + string.Join(",", data));
+                ET.Log.Error("PoemGalleryData Download  failed!!! data:" + JsonUtility.ToJson(data));
                 data.Ntexture = null;
                 ViewManager.Hide<ModalStatusView>();
                 yield return null;
@@ -65,7 +65,7 @@ namespace GFGGame
                 if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError)
                 {
                     PromptController.Instance.ShowFloatTextPrompt("下载失败");
-                    ET.Log.Error("Download  failed, error code:" + request.result);
+                    ET.Log.Error("Download  failed, error code:" + request.result, ",data:" + JsonUtility.ToJson(data));
                     count += 1;
                     yield return DownloadPicture(data, count);
                 }
@@ -96,7 +96,7 @@ namespace GFGGame
         {
             if (count >= 5)
             {
-                ET.Log.Error("PoemPhotoData Download  failed!!! data:" + string.Join(",", data));
+                ET.Log.Error("PoemPhotoData Download  failed!!! data:" + JsonUtility.ToJson(data));
                 data.Ntexture = null;
                 ViewManager.Hide<ModalStatusView>();
                 yield return null;
@@ -107,7 +107,7 @@ namespace GFGGame
                 if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError)
                 {
                     PromptController.Instance.ShowFloatTextPrompt("下载失败");
-                    ET.Log.Error("Download  failed, error code:" + request.result);
+                    ET.Log.Error("Download  failed, error code:" + request.result, ",data:" + JsonUtility.ToJson(data));
                     count += 1;
                     yield return DownloadPicture(data, count);
                 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs

@@ -210,7 +210,7 @@ namespace GFGGame
                 com.m_loaHeadBorder.url = "";
                 com.m_btnAppoint.visible = false;
                 com.m_loaTitle.url = "";
-                com.target.data = null;
+                com.m_comHead.target.data = null;
             }
             else
             {