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

FGUIProject/assets/poem/PoemGalleryPreviewUI.xml

@@ -8,11 +8,11 @@
     <remark page="4" value="我的作品"/>
   </controller>
   <displayList>
-    <graph id="n17_r9ri" name="n17" xy="0,0" size="1080,1920" alpha="0.8" type="rect" lineSize="0" fillColor="#ff000000">
+    <graph id="n17_r9ri" name="n17" xy="0,0" size="1080,1920" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <loader id="n1_r9ri" name="loaPicture" xy="0,0" size="1080,1920" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="height-height"/>
+    <loader id="n1_r9ri" name="loaPicture" xy="0,0" size="1080,1920" align="center" vAlign="middle" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width"/>
     </loader>
     <component id="n0_r9ri" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
@@ -37,10 +37,10 @@
     <group id="n12_r9ri" name="n12" xy="165,35" size="902,236"/>
     <image id="n11_r9ri" name="n11" src="r9ri125" fileName="imagesGallery/hl_grxxdi.png" xy="0,1743" group="n16_r9ri"/>
     <text id="n15_r9ri" name="txtTheme" xy="52,1812" size="495,54" group="n16_r9ri" fontSize="40" color="#ac9370" text="11/11至11/12主题名称xx"/>
-    <component id="n13_r9ri" name="btnCollect" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="710,1815" group="n16_r9ri">
+    <component id="n13_r9ri" name="btnCollect" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="710,1815" size="47,44" group="n16_r9ri">
       <Button title="50000" icon="ui://iyz778gkdhoatjp" selectedIcon="ui://iyz778gkdhoatjs"/>
     </component>
-    <component id="n14_r9ri" name="btnVote" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="903,1815" group="n16_r9ri">
+    <component id="n14_r9ri" name="btnVote" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="903,1815" size="48,45" group="n16_r9ri">
       <Button title="50000" icon="ui://iyz778gkdhoatjr" selectedIcon="ui://iyz778gkdhoatjq"/>
     </component>
     <group id="n16_r9ri" name="n16" xy="0,1743" size="1080,177" advanced="true">

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -69,6 +69,7 @@ namespace GFGGame
             _imgShouTong.visible = false;
             // _grpCount.visible = true;
             _showTips = true;
+            _txtCount.visible = true;
 
             _txtName.text = itemCfg.name;
             _txtCount.SetVar("count", _itemData.num.ToString()).FlushVars();
@@ -228,6 +229,14 @@ namespace GFGGame
         {
             _txtCount.SetPosition(x, y, 0);
         }
+        public bool ShowTxtCount
+        {
+            set
+            {
+                _txtCount.visible = value;
+            }
+        }
+
         public void SetTxtNamePos(int x, int y)
         {
             _txtName.SetPosition(x, y, 0);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -173,6 +173,7 @@ namespace GFGGame
                 item.data = new ItemView(listItem.m_comItem as GComponent);
             }
             (item.data as ItemView).SetData(itemData);
+            (item.data as ItemView).ShowTxtCount = false;
             List<ItemData> bonusOnceData = StoryBonusDataCache.GetBonusData(_levelID).bonusOnce;
             (item.data as ItemView).ImgShouTongVisable = !InstanceZonesDataManager.CheckLevelPass(_levelID) && index < bonusOnceData.Count;
             UI_ListRewardItem.ProxyEnd();

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

@@ -361,6 +361,9 @@ namespace GFGGame
 
         private void onScrollEnd()
         {
+            GComponent header = _comScroll.scrollPane.header;
+            if (!header.visible || header.height >= header.sourceHeight || isPullDown) return;
+
             if (_comScroll.scrollPane.percY == 1)
             {
                 ReqGalleryList(_galleryDatas.Count);
@@ -655,6 +658,9 @@ namespace GFGGame
         //上拉刷新
         private async void OnPullUpToRefresh()
         {
+            GComponent header = _comScroll.scrollPane.header;
+            if (!header.visible || header.height >= header.sourceHeight || isPullDown) return;
+
             GComponent footer = _comScroll.scrollPane.footer;
             if (footer.height < footer.sourceHeight || isPullUp) return;
             // _lastListCount = _list.numItems;