画廊

FGUIProject/assets/poem/componentsGallery/ComNormal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1619" overflow="hidden" opaque="false">
-  <controller name="c1" pages="0,,1,,2," selected="2"/>
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <component id="n11_r9ri" name="btnShop" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="900,56" size="180,113">
       <gearDisplay controller="c1" pages="0,1"/>
@@ -12,23 +12,23 @@
     </component>
     <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"/>
+      <Button checked="true" icon="ui://iyz778gkr9ri11p" selectedIcon="ui://iyz778gkr9ri11h" controller="c1" page="0"/>
     </component>
     <component id="n7_r9ri" name="btnTab1" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="400,204" group="n8_r9ri">
       <Button icon="ui://iyz778gkr9ri11o" selectedIcon="ui://iyz778gkr9ri11g" controller="c1" page="1"/>
     </component>
     <component id="n9_r9ri" name="btnTab2" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="680,204" group="n8_r9ri">
-      <Button checked="true" icon="ui://iyz778gkr9ri11n" selectedIcon="ui://iyz778gkr9ri11f" controller="c1" page="2"/>
+      <Button icon="ui://iyz778gkr9ri11n" selectedIcon="ui://iyz778gkr9ri11f" controller="c1" page="2"/>
     </component>
     <group id="n8_r9ri" name="grpTab" xy="120,204" size="840,83"/>
     <image id="n25_r9ri" name="n25" src="r9ri11e" fileName="imagesGallery/hl_xzbtzt.png" xy="310,309" group="n26_r9ri"/>
     <text id="n22_r9ri" name="txtTheme" xy="355,315" pivot="0.5,0" size="364,54" group="n26_r9ri" fontSize="40" color="#b08a5d" text="本期主题：风花雪月"/>
     <group id="n26_r9ri" name="grpTheme" xy="310,309" size="499,81"/>
-    <text id="n27_r9ri" name="txtTime" xy="381,430" size="317,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="截止日期:11/01至11/2 "/>
-    <text id="n33_r9ri" name="txtRewardCount" xy="718,430" size="211,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="奖励次数:10/30">
+    <text id="n27_r9ri" name="txtTime" xy="265,430" size="317,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="截止日期:11/01至11/2 "/>
+    <text id="n33_r9ri" name="txtRewardCount" xy="602,430" size="211,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="奖励次数:10/30">
       <gearDisplay controller="c1" pages="0,1"/>
     </text>
-    <group id="n34_r9ri" name="grpTime" xy="381,430" size="317,39" advanced="true" layout="hz" colGap="20" excludeInvisibles="true">
+    <group id="n34_r9ri" name="grpTime" xy="265,430" size="548,39" advanced="true" layout="hz" colGap="20" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n37_r9ri" name="comBoBox" src="r9ri13a" fileName="componentsGallery/ComboBox.xml" xy="763,409">
@@ -42,9 +42,6 @@
     <list id="n23_r9ri" name="listRank" xy="43,483" size="997,1136" overflow="scroll" lineGap="20" defaultItem="ui://iyz778gkr9ri10y" align="center" autoClearItems="true">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="top-top,bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
     </list>
     <text id="n29_r9ri" name="txtRank" xy="830,427" pivot="1,0" size="169,41" fontSize="30" color="#c58383" text="我的排名:20">
       <gearDisplay controller="c1" pages="2"/>

FGUIProject/assets/poem/componentsGallery/ComScroll.xml

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1032,1136" overflow="scroll" ptrRes="ui://iyz778gkr9ri12p,ui://iyz778gkr9ri137">
   <displayList>
-    <list id="n0_r9ri" name="listRecommend" xy="10,0" size="500,1136" ptrRes="ui://iyz778gkr9ri12p,ui://iyz778gkr9ri137" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <list id="n1_r9ri" name="listRecommend1" xy="524,0" size="500,1136" ptrRes="ui://iyz778gkr9ri12p,ui://iyz778gkr9ri137" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
+    <list id="n0_r9ri" name="listRecommend" xy="10,0" size="500,1136" ptrRes="ui://iyz778gkr9ri12p,ui://iyz778gkr9ri137" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true"/>
+    <list id="n1_r9ri" name="listRecommend1" xy="524,0" size="500,1136" ptrRes="ui://iyz778gkr9ri12p,ui://iyz778gkr9ri137" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true"/>
   </displayList>
 </component>

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

@@ -117,6 +117,19 @@ namespace GFGGame
         private async void OnBtnVoteClick(EventContext context)
         {
             if (_galleryData.VoteOrNot) return;
+
+            if (PoemGalleryDataManager.Instance.IsResulting())
+            {
+                _ui.m_btnVote.selected = _galleryData.VoteOrNot;
+                PromptController.Instance.ShowFloatTextPrompt("排行榜数据正在结算，无法操作");
+                return;
+            }
+            if (!PoemGalleryDataManager.Instance.IsCurThemeWork(_galleryData.CreateTime))
+            {
+                _ui.m_btnVote.selected = _galleryData.VoteOrNot;
+                PromptController.Instance.ShowFloatTextPrompt("往期作品，无法操作");
+                return;
+            }
             bool result = await PoemGallerySProxy.ReqVoteGalleryWorks(_galleryData.WorkId);
             if (result)
             {

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

@@ -167,7 +167,7 @@ namespace GFGGame
 
                 OnFavoritesTabChange();
                 OnNormalTabChange();
-
+                PullDown();
             }
 
             _ui.m_c1.selectedIndex = _tabIndex;
@@ -303,6 +303,7 @@ namespace GFGGame
         }
         private void UpdateList()
         {
+
             if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.RECOMMEND)//首页
             {
                 _ui.m_comNormal.m_comScroll.target.scrollPane.header.visible = true;
@@ -413,12 +414,17 @@ namespace GFGGame
         /********************************************************界面更新*************************************************/
         private void UpdateView()
         {
+            bool isResulting = PoemGalleryDataManager.Instance.IsResulting();
+            _ui.m_comNormal.m_grpResult.visible = isResulting;
+            _ui.m_comNormal.m_comScroll.target.visible = !isResulting;
+            _ui.m_comNormal.m_listRank.visible = !isResulting;
+
             GalleryThemeCfg themeCfg = GalleryThemeCfgArray.Instance.GetCfg((int)PoemGalleryDataManager.Instance.ThemeId);
             _ui.m_comNormal.m_txtTheme.text = string.Format("本期主题：{0}", themeCfg.theme);
-            _ui.m_comNormal.m_txtRank.text = string.Format("我的排名: {0}", PoemGalleryDataManager.Instance.MyRank > 0 ? PoemGalleryDataManager.Instance.MyRank.ToString() : "- -");
+            _ui.m_comNormal.m_txtRank.text = string.Format("我的排名: {0}", PoemGalleryDataManager.Instance.MyRank > 0 && !isResulting ? PoemGalleryDataManager.Instance.MyRank.ToString() : "- -");
             _ui.m_comNormal.m_txtRewardCount.text = string.Format("奖励次数：{0}/{1}", GameGlobal.myNumericComponent.GetAsInt(NumericType.LikeGalleryWorksCountDaily), GalleryIntegralCfgArray.Instance.dataArray.Length);
             _ui.m_comNormal.m_txtTime.text = string.Format("截止日期：{0}", PoemGalleryDataManager.Instance.GetThemeTime());
-            _ui.m_comNormal.m_grpResult.visible = PoemGalleryDataManager.Instance.IsResulting();
+
         }
 
 
@@ -549,11 +555,25 @@ namespace GFGGame
 
         private async void OnBtnVoteClick(EventContext context)
         {
-            GObject obj = context.sender as GObject;
+            GButton obj = context.sender as GButton;
+
             long workId = (long)obj.data;
             PoemGalleryData galleryData = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
 
-            if (galleryData.VoteOrNot ||!PoemGalleryDataManager.Instance.IsCurThemeWork(galleryData.CreateTime)) return;
+            if (galleryData.VoteOrNot) return;
+            if (PoemGalleryDataManager.Instance.IsResulting())
+            {
+                obj.selected = galleryData.VoteOrNot;
+                PromptController.Instance.ShowFloatTextPrompt("排行榜数据正在结算，无法操作");
+                return;
+            }
+            if (!PoemGalleryDataManager.Instance.IsCurThemeWork(galleryData.CreateTime))
+            {
+                obj.selected = galleryData.VoteOrNot;
+                PromptController.Instance.ShowFloatTextPrompt("往期作品，无法操作");
+                return;
+            }
+
             bool result = await PoemGallerySProxy.ReqVoteGalleryWorks(workId);
             if (result)
             {
@@ -575,7 +595,7 @@ namespace GFGGame
         //自动下拉
         private void PullDown()
         {
-            _list.ScrollToView(0);
+            if (_list.numItems > 0) _list.ScrollToView(0);
             GComponent header = _comScroll.scrollPane.header;
             header.height = header.sourceHeight;
         }