画廊

FGUIProject/assets/CommonGame/SuitPartsDetailUI.xml

@@ -6,7 +6,7 @@
     </loader>
     <image id="n4_cs8j" name="n4" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" xy="230,32"/>
     <text id="n2_pjip" name="txtTitle" xy="104,36" size="726,72" fontSize="54" color="#8f6e30" align="center" autoSize="none" text="套装详情"/>
-    <list id="n3_pjip" name="listParts" xy="24,179" size="887,540" layout="flow_hz" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    <list id="n3_pjip" name="listParts" xy="23,179" size="890,540" layout="flow_hz" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/poem/componentsGallery/ComFavorites.xml

@@ -2,7 +2,7 @@
 <component size="1080,1336" opaque="false">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n23_r9ri" name="n23" src="r9ri12w" fileName="imagesGallery/hl_sczpxzdik.png" xy="244,212" size="592,76" group="n27_r9ri"/>
+    <image id="n23_r9ri" name="n23" src="r9ri12w" fileName="imagesGallery/hl_sczpxzdik.png" xy="245,212" size="590,76" group="n27_r9ri"/>
     <component id="n24_r9ri" name="btnTab0" src="r9ri130" fileName="componentsGallery/Button12.xml" xy="244,210" group="n27_r9ri">
       <Button checked="true" icon="ui://iyz778gkr9ri12z" selectedIcon="ui://iyz778gkr9ri12x" controller="c1" page="0"/>
     </component>

FGUIProject/assets/poem/componentsGallery/ComNormal.xml

@@ -10,7 +10,7 @@
       <gearDisplay controller="c1" pages="2"/>
       <Button icon="ui://iyz778gkr9ri12q"/>
     </component>
-    <image id="n5_r9ri" name="n5" src="r9ri12w" fileName="imagesGallery/hl_sczpxzdik.png" xy="135,206" size="810,76" group="n8_r9ri"/>
+    <image id="n5_r9ri" name="n5" src="r9ri12w" fileName="imagesGallery/hl_sczpxzdik.png" xy="137,206" size="805,76" group="n8_r9ri"/>
     <component id="n6_r9ri" name="btnTab0" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="120,204" group="n8_r9ri">
       <Button icon="ui://iyz778gkr9ri11p" selectedIcon="ui://iyz778gkr9ri11h" controller="c1" page="0"/>
     </component>

FGUIProject/assets/poem/componentsGallery/ListItem.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="500,900">
+<component size="500,900" overflow="hidden">
   <displayList>
     <loader id="n15_r9ri" name="loaIcon" xy="4,2" pivot="0.5,0" size="492,820" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleMatchWidth"/>
     <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,903">

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

@@ -109,14 +109,16 @@ namespace GFGGame
         {
             S2C_NoticeGalleryWorksUploaded response = null;
             response = (S2C_NoticeGalleryWorksUploaded)await MessageHelper.SendToServer(new C2S_NoticeGalleryWorksUploaded() { WorksId = worksId });
+            ViewManager.Hide<ModalStatusView>();
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    PromptController.Instance.ShowFloatTextPrompt("上传成功");
                     return true;
                 }
             }
-            ViewManager.Hide<ModalStatusView>();
+
             return false;
         }
 
@@ -177,7 +179,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    PoemGalleryDataManager.Instance.UpdateFavoriteState(response.WorksId, true, response.BelikedCount);
+                    PoemGalleryDataManager.Instance.UpdateVoteiteState(response.WorksId, true, response.BelikedCount);
 
                     return true;
                 }

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

@@ -856,6 +856,12 @@ namespace GFGGame
         }
         private void OnClickBtnNext()
         {
+            if (!EquipDataCache.cacher.CheckPutOnFinish())
+            {
+                AlertUI.Show("只有换好衣服才能出门哦！")
+                    .SetRightButton(true, "好的");
+                return;
+            }
             if (!ViewManager.Show<PhotographView>(this.viewData))
             {
                 return;

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

@@ -85,6 +85,8 @@ namespace GFGGame
 
             _ui.m_comNormal.m_comBoBox.items = new string[] { "推荐", "最新" };
             _ui.m_comNormal.m_comBoBox.icons = new string[] { "ui://Poem/hl_pxpx", "ui://Poem/hl_zxzx" };
+            _ui.m_comNormal.m_comBoBox.onChanged.Add(OnNormalTabChange);
+
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_btnRecover.onClick.Add(OnBtnRecoverClick);
             _ui.m_btnJoin.onClick.Add(OnBtnJoinClick);
@@ -111,6 +113,8 @@ namespace GFGGame
             _ui.m_comNormal.m_c1.onChanged.Add(OnNormalTabChange);
             _ui.m_comFavorites.m_c1.onChanged.Add(OnFavoritesTabChange);
 
+
+
         }
         protected override void AddEventListener()
         {
@@ -129,8 +133,14 @@ namespace GFGGame
                 _tabIndex = (int)(this.viewData as object[])[0];
                 _subtabIndex = (int)(this.viewData as object[])[1];
                 _ui.m_comNormal.m_comBoBox.selectedIndex = (int)(this.viewData as object[])[2];
-                _ui.m_comNormal.m_c1.selectedIndex = _subtabIndex;
-                _ui.m_comFavorites.m_c1.selectedIndex = _subtabIndex;
+                if (_tabIndex == TabType.RECOVER)
+                {
+                    _ui.m_comNormal.m_c1.selectedIndex = _subtabIndex;
+                }
+                else if (_tabIndex == TabType.FAVORITES)
+                {
+                    _ui.m_comFavorites.m_c1.selectedIndex = _subtabIndex;
+                }
 
                 UpdateGalleryList();
             }
@@ -321,7 +331,7 @@ namespace GFGGame
         {
             if (_comScroll.scrollPane.percY == 1)
             {
-                ReqGalleryList(_list.numItems);
+                ReqGalleryList(_galleryDatas.Count + 1);
             }
         }
         //请求刷新