Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

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

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

@@ -123,7 +123,7 @@ namespace GFGGame
         }
         public static IEnumerator DownloadFile(PoemPhotoData poemPhotoData)
         {
-
+            ET.Log.Debug("PictureTempUrl:" + poemPhotoData.PictureTempUrl);
             using (UnityWebRequest request = UnityWebRequestTexture.GetTexture(poemPhotoData.PictureTempUrl))
             {
                 yield return request.SendWebRequest();