画廊

FGUIProject/assets/Common/ModalStatusUI.xml

@@ -7,7 +7,7 @@
     <graph id="n1_d4iw" name="n1" xy="390,20" size="300,40" visible="false" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <text id="n2_d4iw" name="txtMessage" xy="290,976" size="500,42" fontSize="30" color="#ad987d" align="center" autoSize="none" autoClearText="true" text="这是一个提示"/>
+    <text id="n2_d4iw" name="txtMessage" xy="290,976" size="500,42" fontSize="30" color="#876e54" align="center" autoSize="none" autoClearText="true" text="这是一个提示"/>
     <graph id="n4_t6aj" name="holder" xy="539,959" size="1,1"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/DressUpUI.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="UI"/>
+    <remark page="1" value="清屏展示"/>
+  </controller>
+  <controller name="c2" pages="0,,1," selected="0">
+    <remark page="0" value="换装"/>
+    <remark page="1" value="画廊评选搭配"/>
+  </controller>
   <displayList>
     <graph id="n18_k6he" name="touchPad" xy="0,0" size="1080,1920" alpha="0" type="rect">
       <relation target="" sidePair="width-width,height-height"/>
@@ -9,7 +16,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <component id="n28_8lqj" name="btnShow" src="f4xv3o" fileName="components/Button6.xml" xy="56,1633" size="84,87" visible="false">
-      <relation target="n34_wono" sidePair="left-left,bottom-bottom"/>
+      <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wbrc0744"/>
     </component>
     <component id="n3_q08x" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60" group="n30_8lqj">
@@ -17,6 +24,7 @@
     </component>
     <component id="n4_q08x" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n30_8lqj" visible="false"/>
     <component id="n13_q08x" name="comboBox" src="q08x15" fileName="components/ComboBoxSuit.xml" xy="271,66" group="n30_8lqj">
+      <gearDisplay controller="c2" pages="0"/>
       <ComboBox title="套装一" visibleItemCount="10" direction="down" autoClearItems="true">
         <item title="1"/>
         <item title="2"/>
@@ -41,16 +49,23 @@
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>
     </component>
-    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1156" size="141,120" group="n34_wono">
+    <component id="n35_r9ri" name="btnNext" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj">
+      <gearDisplay controller="c2" pages="1"/>
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+      <Button title="下一步" titleColor="#fdfaed" titleFontSize="54"/>
+    </component>
+    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1124" size="141,120" group="n34_wono">
+      <gearDisplay controller="c2" pages="0"/>
       <Button icon="ui://mbo439wbj48o3x"/>
     </component>
     <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="56,1276" size="84,87" group="n34_wono" aspect="true">
+      <gearDisplay controller="c2" pages="0"/>
       <Button icon="ui://mbo439wbq08xm"/>
     </component>
-    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1436" size="84,87" group="n34_wono" visible="false">
+    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1404" size="84,87" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08x6"/>
     </component>
-    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1550" size="84,87" group="n34_wono" visible="false">
+    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1518" size="84,87" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08xl"/>
     </component>
     <component id="n22_f4xv" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="56,1395" size="84,87" group="n34_wono">
@@ -62,10 +77,10 @@
     <component id="n29_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="56,1633" size="84,87" group="n34_wono">
       <Button icon="ui://mbo439wbrc0743"/>
     </component>
-    <group id="n34_wono" name="n34" xy="27,1156" size="145,564" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n34_wono" name="n34" xy="27,1124" size="141,596" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </group>
-    <group id="n30_8lqj" name="grpContent" xy="27,0" size="1293,1920" advanced="true">
+    <group id="n30_8lqj" name="grpContent" xy="27,0" size="1283,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
   </displayList>

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" scroll="both">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n8_g3xa" name="btnBg" xy="0,0" size="1080,1136">
       <relation target="" sidePair="height-height"/>
@@ -15,23 +16,24 @@
     <component id="n5_7dea" name="ComSelectRes" src="7dea4f" fileName="components/ComSelect.xml" xy="0,1086">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
+    <component id="n18_r9ri" name="btnGalleryJoin" src="g3xa4h" fileName="components/Button8.xml" xy="940,409" group="n16_9ico">
+      <gearDisplay controller="c1" pages="1"/>
+      <Button icon="ui://mbo439wbnz0t5d"/>
+    </component>
     <component id="n10_i3ix" name="btnPhotograph" src="g3xa4h" fileName="components/Button8.xml" xy="940,409" group="n16_9ico">
-      <relation target="" sidePair="bottom-bottom"/>
+      <gearDisplay controller="c1" pages="0"/>
       <Button icon="ui://mbo439wbnz0t5d"/>
     </component>
     <component id="n6_g3xa" name="btnChoose" src="g3xa4h" fileName="components/Button8.xml" xy="940,554" group="n16_9ico">
-      <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mbo439wbxmtl4s"/>
     </component>
     <component id="n13_u7i8" name="btnUp" src="g3xa4h" fileName="components/Button8.xml" xy="940,699" group="n16_9ico">
-      <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mbo439wb9ico5f"/>
     </component>
     <component id="n14_u7i8" name="btnDown" src="g3xa4h" fileName="components/Button8.xml" xy="940,844" group="n16_9ico">
-      <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mbo439wb9ico5e"/>
     </component>
-    <group id="n16_9ico" name="n16" xy="940,409" size="125,560" advanced="true">
+    <group id="n16_9ico" name="n16" xy="940,409" size="125,560" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
   </displayList>

FGUIProject/assets/poem/componentsGallery/ComNormal.xml

@@ -13,6 +13,10 @@
       <gearDisplay controller="c1" pages="0"/>
       <Button title="最新" icon="ui://iyz778gkuyuxzp"/>
     </component>
+    <component id="n24_r9ri" name="btnReward" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="787,2" size="77,76">
+      <gearDisplay controller="c1" pages="0"/>
+      <Button title="奖励" icon="ui://iyz778gkuyuxzp"/>
+    </component>
     <image id="n5_r9ri" name="n5" src="uyuxzx" fileName="imagesPhoto/xc_xzdik.png" xy="30,180" size="840,76" group="n8_r9ri"/>
     <component id="n6_r9ri" name="btnTab0" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="30,178" group="n8_r9ri">
       <Button title="推荐" selectedIcon="ui://iyz778gkuyuxzw" controller="c1" page="0"/>
@@ -26,19 +30,20 @@
     <group id="n8_r9ri" name="grpTab" xy="30,178" size="840,82"/>
     <text id="n22_r9ri" name="txtTheme" xy="296,298" pivot="0.5,0" size="270,41" fontSize="30" text="本期主题：风花雪月"/>
     <list id="n14_r9ri" name="listRecommend" xy="0,397" size="918,1222" layout="flow_hz" overflow="scroll" ptrRes="ui://iyz778gkr9ri11a," colGap="20" defaultItem="ui://iyz778gkr9ri10w">
+      <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n21_r9ri" name="listFriend" xy="0,397" size="918,1222" layout="flow_hz" overflow="scroll" ptrRes="ui://iyz778gkv4822," colGap="20" defaultItem="ui://iyz778gkr9ri10w">
+    <list id="n21_r9ri" name="listFriend" xy="0,397" size="918,1222" layout="flow_hz" overflow="scroll" colGap="20" defaultItem="ui://iyz778gkr9ri10w">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n23_r9ri" name="listRank" xy="-21,392" size="933,1064" layout="flow_hz" overflow="scroll" defaultItem="ui://iyz778gkr9ri10y">
+    <list id="n23_r9ri" name="listRank" xy="106,418" size="933,1064" layout="flow_hz" overflow="scroll" defaultItem="ui://iyz778gkr9ri10y">
       <gearDisplay controller="c1" pages="2"/>
       <item/>
       <item/>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpUI.cs

@@ -8,6 +8,7 @@ namespace UI.DressUp
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GGraph m_touchPad;
         public GLoader m_loaShow;
         public GButton m_btnShow;
@@ -19,6 +20,7 @@ namespace UI.DressUp
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList2;
         public GButton m_btnSave;
+        public GButton m_btnNext;
         public GButton m_btnAction;
         public GButton m_btnPhoto;
         public GButton m_btnLastStep;
@@ -75,6 +77,7 @@ namespace UI.DressUp
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_touchPad = (GGraph)comp.GetChild("touchPad");
             m_loaShow = (GLoader)comp.GetChild("loaShow");
             m_btnShow = (GButton)comp.GetChild("btnShow");
@@ -86,6 +89,7 @@ namespace UI.DressUp
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
             m_btnSave = (GButton)comp.GetChild("btnSave");
+            m_btnNext = (GButton)comp.GetChild("btnNext");
             m_btnAction = (GButton)comp.GetChild("btnAction");
             m_btnPhoto = (GButton)comp.GetChild("btnPhoto");
             m_btnLastStep = (GButton)comp.GetChild("btnLastStep");
@@ -98,6 +102,7 @@ namespace UI.DressUp
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_touchPad = null;
             m_loaShow = null;
             m_btnShow = null;
@@ -113,6 +118,7 @@ namespace UI.DressUp
             m_partsList2.Dispose();
             m_partsList2 = null;
             m_btnSave = null;
+            m_btnNext = null;
             m_btnAction = null;
             m_btnPhoto = null;
             m_btnLastStep = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographUI.cs

@@ -7,12 +7,14 @@ namespace UI.DressUp
     public partial class UI_PhotographUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_btnBg;
         public GLoader m_loaGuide;
         public GLoader m_loaGuide1;
         public UI_ComChecked m_comSelectBox;
         public GButton m_btnBack;
         public UI_ComSelect m_ComSelectRes;
+        public GButton m_btnGalleryJoin;
         public GButton m_btnPhotograph;
         public GButton m_btnChoose;
         public GButton m_btnUp;
@@ -64,12 +66,14 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_btnBg = (GLoader)comp.GetChild("btnBg");
             m_loaGuide = (GLoader)comp.GetChild("loaGuide");
             m_loaGuide1 = (GLoader)comp.GetChild("loaGuide1");
             m_comSelectBox = (UI_ComChecked)UI_ComChecked.Create(comp.GetChild("comSelectBox"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_ComSelectRes = (UI_ComSelect)UI_ComSelect.Create(comp.GetChild("ComSelectRes"));
+            m_btnGalleryJoin = (GButton)comp.GetChild("btnGalleryJoin");
             m_btnPhotograph = (GButton)comp.GetChild("btnPhotograph");
             m_btnChoose = (GButton)comp.GetChild("btnChoose");
             m_btnUp = (GButton)comp.GetChild("btnUp");
@@ -77,6 +81,7 @@ namespace UI.DressUp
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_btnBg = null;
             m_loaGuide = null;
             m_loaGuide1 = null;
@@ -85,6 +90,7 @@ namespace UI.DressUp
             m_btnBack = null;
             m_ComSelectRes.Dispose();
             m_ComSelectRes = null;
+            m_btnGalleryJoin = null;
             m_btnPhotograph = null;
             m_btnChoose = null;
             m_btnUp = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComNormal.cs

@@ -11,6 +11,7 @@ namespace UI.Poem
         public GButton m_btnShop;
         public GButton m_btnRecommend;
         public GButton m_btnNewest;
+        public GButton m_btnReward;
         public GButton m_btnTab0;
         public GButton m_btnTab1;
         public GButton m_btnTab2;
@@ -69,6 +70,7 @@ namespace UI.Poem
             m_btnShop = (GButton)comp.GetChild("btnShop");
             m_btnRecommend = (GButton)comp.GetChild("btnRecommend");
             m_btnNewest = (GButton)comp.GetChild("btnNewest");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
             m_btnTab0 = (GButton)comp.GetChild("btnTab0");
             m_btnTab1 = (GButton)comp.GetChild("btnTab1");
             m_btnTab2 = (GButton)comp.GetChild("btnTab2");
@@ -83,6 +85,7 @@ namespace UI.Poem
             m_btnShop = null;
             m_btnRecommend = null;
             m_btnNewest = null;
+            m_btnReward = null;
             m_btnTab0 = null;
             m_btnTab1 = null;
             m_btnTab2 = null;

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

@@ -73,6 +73,12 @@ namespace GFGGame
                     return new string[] { response.TempPictureUrl, response.PictureObjectPath };
                 }
             }
+            else
+            {
+                ViewManager.Hide<ModalStatusView>();
+                PromptController.Instance.ShowFloatTextPrompt("获取上传地址失败");
+            }
+
             return null;
         }
 
@@ -87,6 +93,8 @@ namespace GFGGame
             await response.Content.ReadAsStreamAsync();
             if (response.StatusCode != HttpStatusCode.OK)
             {
+                ViewManager.Hide<ModalStatusView>();
+                PromptController.Instance.ShowFloatTextPrompt("上传资源失败");
                 return false;
             }
             else
@@ -102,11 +110,12 @@ namespace GFGGame
             S2C_AddPicture response = null;
             response = (S2C_AddPicture)await MessageHelper.SendToServer(new C2S_AddPicture() { PictureObjectPath = pictureObjectPath, SourceType = sourceType });
 
+            ViewManager.Hide<ModalStatusView>();
+
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-
                     PoemPhotoData photoData = new PoemPhotoData();
                     photoData.PictureId = response.PictureInfo.PictureId;
                     photoData.CreationTime = response.PictureInfo.CreationTime;
@@ -116,9 +125,12 @@ namespace GFGGame
                     PoemPhotoDataManager.Instance.Add(photoData, sourceType);
                     EventAgent.DispatchEvent(ConstMessage.POEM_PHOTO_INFOS_CHANGE);
                     PromptController.Instance.ShowFloatTextPrompt("已保存至相册");
+
                     return response.PictureInfo.PictureId;
                 }
             }
+
+            PromptController.Instance.ShowFloatTextPrompt("存储数据失败");
             return 0;
         }
         public static IEnumerator DownloadFile(PoemPhotoData poemPhotoData)

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

@@ -92,6 +92,7 @@ namespace GFGGame
             _ui.m_partsList.m_comboBoxRarity.onChanged.Add(OnComboBoxRarityChanged);
             _ui.m_btnAction.onClick.Add(OnClickBtnAction);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
+            _ui.m_btnNext.onClick.Add(OnClickBtnNext);
 
             _ui.m_btnShow.onClick.Add(OnClickBtnShow);
             _ui.m_btnHide.onClick.Add(OnClickBtnHide);
@@ -113,6 +114,10 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            if (this.viewData != null)
+            {
+                _ui.m_c2.selectedIndex = (int)this.viewData;
+            }
 
             _rarityIndex = SORT_BY_HIGH_RARITY;
             // MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DRESS_UP, "mp3"));
@@ -833,8 +838,8 @@ namespace GFGGame
         private void OnClickLoaShow()
         {
             _ui.m_btnShow.alpha = 1;
-            // Timers.inst.Add(2f, 1, SetBtnShowVisable);
             _ui.m_btnShow.enabled = true;
+            Timers.inst.Add(2f, 1, SetBtnShowVisable);
 
         }
         private void OnClickBtnPhoto()
@@ -848,6 +853,15 @@ namespace GFGGame
             _ui.target.visible = false;
             this._sceneObject.gameObject.SetActive(false);
         }
+        private void OnClickBtnNext()
+        {
+            if (!ViewManager.Show<PhotographView>(this.viewData))
+            {
+                return;
+            }
+            _ui.target.visible = false;
+            this._sceneObject.gameObject.SetActive(false);
+        }
         private void UpdateScene()
         {
             _ui.target.visible = true;

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

@@ -78,13 +78,16 @@ namespace GFGGame
                 return;
             }
 
+            ViewManager.Show<ModalStatusView>("上传中...");
 
             string[] rsp = await PoemPhotoSProxy.ReqTempPictureUrl((int)PictureType.jpg);
             if (rsp == null) return;
 
+
             bool pushResult = await PoemPhotoSProxy.PushToHWCloud(rsp[0], bytes);
             if (!pushResult) return;
 
+
             long addResult = await PoemPhotoSProxy.ReqAddTophoto(rsp[1], (int)PictureSourceType.PersonalAlbum);
             if (addResult > 0)
             {
@@ -101,6 +104,7 @@ namespace GFGGame
                     }
                 }
             }
+
             _ui.m_btnSavePhoto.touchable = false;
 
         }

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

@@ -79,6 +79,7 @@ namespace GFGGame
             _ui.m_btnChoose.onClick.Add(SetUIView);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnPhotograph.onClick.Add(OnClickBtnPhotograph);
+            _ui.m_btnGalleryJoin.onClick.Add(OnClickBtnGalleryJoin);
 
             _ui.m_ComSelectRes.m_list.itemRenderer = RenderListItem;
             _ui.m_ComSelectRes.m_list.onClickItem.Add(OnListItemClick);
@@ -110,6 +111,11 @@ namespace GFGGame
             base.OnShown();
             Input.multiTouchEnabled = true;
 
+            if (this.viewData != null)
+            {
+                _ui.m_c1.selectedIndex = (int)this.viewData;
+            }
+
             PhotographDataManager.Instance.ClassifyEquipData();
             _equipSceneData = PhotographDataManager.Instance._equipSceneData;
 
@@ -547,6 +553,11 @@ namespace GFGGame
             GRoot.inst.visible = false;
             Timers.inst.StartCoroutine(ScreenShotTex());// ();
         }
+        private void OnClickBtnGalleryJoin()
+        {
+            GRoot.inst.visible = false;
+            Timers.inst.StartCoroutine(ScreenShotTex());// ();
+        }
         private IEnumerator ScreenShotTex()
         {
             GRoot.inst.visible = false;
@@ -557,12 +568,26 @@ namespace GFGGame
             tex.ReadPixels(rect, 0, 0);//读取像素，屏幕左下角为0点
             tex.Apply();//保存像素信息
 
-            ViewManager.Show<PhotographSaveView>(tex);
-            GRoot.inst.visible = true;
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.PAI_ZHAO, 2);
-
+            if (_ui.m_c1.selectedIndex == 0)
+            {
+                ViewManager.Show<PhotographSaveView>(tex);
+                GRoot.inst.visible = true;
+                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.PAI_ZHAO, 2);
+            }
+            else if (_ui.m_c1.selectedIndex == 1)
+            {
+                AlertUI.Show("是否确认上传此作品？")
+                .SetLeftButton(true, "否").SetRightButton(true, "是", async (object data) =>
+                {
+                    ViewManager.Show<ModalStatusView>("上传中...");
+                    bool result = true;// await PoemPhotoSProxy.ReqRemovedPhoto(_listDelete, _sourceType);
+                    if (result)
+                    {
+                        ViewManager.Hide<ModalStatusView>();
+                    }
+                });
+            }
         }
-
         private void OnClickBtnBack()
         {
             this.Hide();

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

@@ -36,16 +36,23 @@ namespace GFGGame
             _ui.m_btnJoin.onClick.Add(OnBtnJoinClick);
             _ui.m_btnFavorites.onClick.Add(OnBtnFavoritesClick);
 
+            _ui.m_comNormal.m_listRecommend.itemRenderer = RenderListItem;
+            _ui.m_comNormal.m_listRecommend.SetVirtual();
+            _ui.m_comNormal.m_listRecommend.scrollPane.onPullDownRelease.Add(onPullDownRelease);
+            _ui.m_comNormal.m_listRecommend.scrollPane.header.onSizeChanged.Add(OnSizeChanged);
+            _ui.m_comNormal.m_listFriend.itemRenderer = RenderListItem;
+            _ui.m_comNormal.m_listFriend.SetVirtual();
+            _ui.m_comNormal.m_listRank.itemRenderer = RenderListRankItem;
+            _ui.m_comNormal.m_listRank.SetVirtual();
             _ui.m_comNormal.m_btnShop.onClick.Add(OnBtnShopClick);
             _ui.m_comNormal.m_btnRecommend.onClick.Add(OnBtnRecommendClick);
             _ui.m_comNormal.m_btnNewest.onClick.Add(OnBtnNewestClick);
+            _ui.m_comNormal.m_btnReward.onClick.Add(OnBtnRewardClick);
             _ui.m_comNormal.m_c1.onChanged.Add(OnNormalTabChange);
+
+
             _ui.m_comFavorites.m_c1.onChanged.Add(OnFavoritesTabChange);
 
-            _ui.m_comNormal.m_listRecommend.itemRenderer = RenderListItem;
-            _ui.m_comNormal.m_listRecommend.SetVirtual();
-            _ui.m_comNormal.m_listRecommend.scrollPane.onPullDownRelease.Add(onPullDownRelease);
-            _ui.m_comNormal.m_listRecommend.scrollPane.header.onSizeChanged.Add(OnSizeChanged);
 
         }
         protected override void AddEventListener()
@@ -75,26 +82,33 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(PoemGalleryView).FullName);
         }
-
-        //投稿
+        /// <summary>
+        /// 投稿
+        /// </summary>
         private void OnBtnJoinClick()
         {
 
         }
 
-        //首页
+        /// <summary>
+        /// 首页
+        /// </summary>
         private void OnBtnRecoverClick()
         {
             _ui.m_comNormal.m_c1.selectedIndex = 0;
         }
 
-        //收藏夹
+        /// <summary>
+        ///收藏夹 
+        /// </summary>
         private void OnBtnFavoritesClick()
         {
             _ui.m_comFavorites.m_c1.selectedIndex = 0;
         }
 
-        //切换首页页签
+        /// <summary>
+        /// 切换首页页签
+        /// </summary>
         private void OnNormalTabChange()
         {
             if (_ui.m_comNormal.m_c1.selectedIndex == 2)
@@ -116,7 +130,9 @@ namespace GFGGame
                 }
             }
         }
-        //切换收藏页签
+        /// <summary>
+        /// 切换收藏页签
+        /// </summary>
         private void OnFavoritesTabChange()
         {
             if (_ui.m_comFavorites.m_c1.selectedIndex == 0)
@@ -130,6 +146,57 @@ namespace GFGGame
                 _galleryInfos = PoemGalleryDataManager.Instance.MySelfInfos;
             }
         }
+
+
+
+
+        /// <summary>
+        /// 积分商店
+        /// </summary>
+        private void OnBtnShopClick()
+        {
+            ViewManager.Show<ClothingShopView>(new object[] { ConstStoreId.GALLERY_STORE_ID }, new object[] { typeof(PoemGalleryView).FullName, this.viewData }, true);
+        }
+
+        /// <summary>
+        /// 推荐
+        /// </summary>
+        private void OnBtnRecommendClick()
+        {
+
+        }
+
+        /// <summary>
+        /// 最新
+        /// </summary>
+        private void OnBtnNewestClick()
+        {
+            ViewManager.Show<PoemGalleryRewardView>(null, new object[] { typeof(PoemGalleryView).FullName, this.viewData }, true);
+        }
+        /// <summary>
+        /// 排行榜奖励
+        /// </summary>
+        private void OnBtnRewardClick()
+        {
+
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+
+        }
+
+
+        private void RenderListRankItem(int index, GObject obj)
+        {
+
+        }
+
+
+
+
+
+
         private void onPullDownRelease()
         {
             GComponent header = _ui.m_comNormal.m_listRecommend.scrollPane.header;
@@ -152,28 +219,5 @@ namespace GFGGame
                 controller.selectedIndex = 0;
             }
         }
-
-        //积分商店
-        private void OnBtnShopClick()
-        {
-            ViewManager.Show<ClothingShopView>(new object[] { ConstStoreId.GALLERY_STORE_ID }, new object[] { typeof(PoemGalleryView).FullName, this.viewData }, true);
-        }
-
-        //推荐
-        private void OnBtnRecommendClick()
-        {
-
-        }
-
-        //最新
-        private void OnBtnNewestClick()
-        {
-
-        }
-
-        private void RenderListItem(int index, GObject obj)
-        {
-
-        }
     }
 }