zhaoyang 2 年之前
父節點
當前提交
9f70e4ebaf

+ 4 - 3
FGUIProject/assets/poem/componentsGallery/ComNormal.xml

@@ -35,6 +35,10 @@
       <gearDisplay controller="c1" pages="0"/>
       <ComboBox visibleItemCount="10"/>
     </component>
+    <component id="n36_r9ri" name="comScroll" src="r9ri139" fileName="componentsGallery/ComScroll.xml" xy="24,483">
+      <gearDisplay controller="c1" pages="0,1"/>
+      <relation target="" sidePair="height-height"/>
+    </component>
     <list id="n23_r9ri" name="listRank" xy="24,483" size="1032,1136" overflow="scroll" lineGap="20" defaultItem="ui://iyz778gkr9ri10y" align="center" autoClearItems="true">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="top-top,bottomext-bottom"/>
@@ -51,8 +55,5 @@
       <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n36_r9ri" name="comScroll" src="r9ri139" fileName="componentsGallery/ComScroll.xml" xy="24,483">
-      <relation target="" sidePair="height-height"/>
-    </component>
   </displayList>
 </component>

+ 0 - 48
GameClient/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs

@@ -57,54 +57,6 @@ namespace GFGGame
             }
         }
 
-
-        private long _voteCount = 0;
-        /// <summary>
-        /// 我的最高排行
-        /// </summary>
-        public long VoteCount
-        {
-            get
-            {
-                return _voteCount;
-            }
-            set
-            {
-                _voteCount = value;
-            }
-        }
-
-
-        // /// <summary>
-        // /// 推荐数据
-        // /// </summary>
-        // public List<PoemGalleryData> RecommendDatas = new List<PoemGalleryData>();
-
-        // /// <summary>
-        // /// 最新数据
-        // /// </summary>
-        // public List<PoemGalleryData> NewestDatas = new List<PoemGalleryData>();
-
-        // /// <summary>
-        // /// 好友数据
-        // /// </summary>
-        // public List<PoemGalleryData> FrinedDatas = new List<PoemGalleryData>();
-
-        // /// <summary>
-        // /// 收藏数据
-        // /// </summary>
-        // public List<PoemGalleryData> FavoriteDatas = new List<PoemGalleryData>();
-
-        // /// <summary>
-        // /// 我的作品数据
-        // /// </summary>
-        // public List<PoemGalleryData> MySelfDatas = new List<PoemGalleryData>();
-
-        // /// <summary>
-        // /// 排行榜数据
-        // /// </summary>
-        // public List<PoemGalleryData> RankDatas = new List<PoemGalleryData>();
-
         /// <summary>
         /// 推荐数据
         /// </summary>

+ 4 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComNormal.cs

@@ -18,10 +18,10 @@ namespace UI.Poem
         public GTextField m_txtRewardCount;
         public GGroup m_grpTime;
         public GComboBox m_comBoBox;
+        public UI_ComScroll m_comScroll;
         public GList m_listRank;
         public GTextField m_txtRank;
         public GGroup m_grpResult;
-        public UI_ComScroll m_comScroll;
         public const string URL = "ui://iyz778gkr9ri114";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ComNormal";
@@ -80,10 +80,10 @@ namespace UI.Poem
             m_txtRewardCount = (GTextField)comp.GetChild("txtRewardCount");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
             m_comBoBox = (GComboBox)comp.GetChild("comBoBox");
+            m_comScroll = (UI_ComScroll)UI_ComScroll.Create(comp.GetChild("comScroll"));
             m_listRank = (GList)comp.GetChild("listRank");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_grpResult = (GGroup)comp.GetChild("grpResult");
-            m_comScroll = (UI_ComScroll)UI_ComScroll.Create(comp.GetChild("comScroll"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -98,11 +98,11 @@ namespace UI.Poem
             m_txtRewardCount = null;
             m_grpTime = null;
             m_comBoBox = null;
+            m_comScroll.Dispose();
+            m_comScroll = null;
             m_listRank = null;
             m_txtRank = null;
             m_grpResult = null;
-            m_comScroll.Dispose();
-            m_comScroll = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -401,7 +401,7 @@ namespace GFGGame
             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);
-            _ui.m_comNormal.m_txtRewardCount.text = string.Format("奖励次数:{0}/{1}", PoemGalleryDataManager.Instance.VoteCount, GalleryRewardCfgArray.Instance.dataArray.Length);
+            _ui.m_comNormal.m_txtRewardCount.text = string.Format("奖励次数:{0}/{1}", GameGlobal.myNumericComponent.GetAsInt(NumericType.LikeGalleryWorksCountDaily), GalleryRewardCfgArray.Instance.dataArray.Length);
             _ui.m_comNormal.m_txtTime.text = string.Format("截止日期:{0}", PoemGalleryDataManager.Instance.GetThemeTime());
             _ui.m_comNormal.m_grpResult.visible = PoemGalleryDataManager.Instance.IsResulting();
         }

二進制
GameClient/Assets/ResIn/UI/Poem/Poem_fui.bytes