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

# Conflicts:
#	GameClient/Assets/StreamingAssets/build_info

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

@@ -168,11 +168,6 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    bool result = await ReqGalleryList((int)GallerySortType.MyWorks, 0, PoemGalleryDataManager.pageCount);
-                    if (result)
-                    {
-                        EventAgent.DispatchEvent(ConstMessage.GALLERY_DATA_CHANGE);
-                    }
                     PoemGalleryDataManager.Instance.MyWorksCountOfTheme = response.MyWorksCountOfTheme;
                     PromptController.Instance.ShowFloatTextPrompt("上传成功");
                     return true;

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -581,6 +581,17 @@ namespace GFGGame
                     bool result = await PoemGallerySProxy.ReqNoticeGalleryWorksUploaded((long)(rsp[1]));
                     if (result)
                     {
+                        PoemGalleryData galleryData = new PoemGalleryData();
+                        galleryData.WorkId = (long)rsp[1];
+                        galleryData.Rank = 0;
+                        galleryData.AuthorId = RoleDataManager.roleId;
+                        galleryData.AuthorName = RoleDataManager.roleName;
+                        galleryData.CreateTime = TimeHelper.ServerNow();
+                        galleryData.ThemeOrder = PoemGalleryDataManager.Instance.ThemeOrder;
+                        galleryData.ThemeId = PoemGalleryDataManager.Instance.ThemeId;
+                        galleryData.Ntexture = new NTexture(tex);
+                        PoemGalleryDataManager.Instance.UpdateGalleryData(galleryData);
+                        PoemGalleryDataManager.Instance.MySelfDatas.Insert(0, galleryData.WorkId);
                         _ui.m_txtCount.text = string.Format("{0}/{1}", PoemGalleryDataManager.Instance.MyWorksCountOfTheme, GlobalCfgArray.globalCfg.maxGalleryWorksCount);
                         ViewManager.Hide<ModalStatusView>();
                         OnClickBtnBack();

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

@@ -57,7 +57,7 @@ namespace GFGGame
             _ui.m_txtName.text = _galleryData.AuthorName;
 
             string themeTime = TimeUtil.FormattingTime4(_galleryData.CreateTime);
-            GalleryThemeCfg themeCfg = GalleryThemeCfgArray.Instance.GetCfg((int)PoemGalleryDataManager.Instance.ThemeId);
+            GalleryThemeCfg themeCfg = GalleryThemeCfgArray.Instance.GetCfg((int)_galleryData.ThemeId);
             string themeName = themeCfg.theme;
             _ui.m_txtTheme.text = string.Format("{0}  主题:{1}", themeTime, themeName);// PoemGalleryDataManager.Instance.GetThemeTime();
             _ui.m_loaPicture.texture = _galleryData.Ntexture;

GameClient/Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from PC-20210915NALA at 2022/11/26 19:20:35
+Build from PC-20210915NALA at 2022/11/26 19:01:18

GameClient/ProjectSettings/ProjectSettings.asset

@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.3
+  bundleVersion: 1.4
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0