画廊商店

FGUIProject/assets/ClothingShop/components/CompItemInfo.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="412,952">
-  <controller name="c1" pages="1,,2,,6,,7," selected="1">
+  <controller name="c1" pages="1,,2,,6,,7,,10," selected="4">
     <remark page="1" value="服装店"/>
     <remark page="2" value="落星商店"/>
     <remark page="3" value="活动商店"/>
+    <remark page="4" value="画廊商店"/>
   </controller>
   <displayList>
     <image id="n7_hinb" name="n7" src="hinb3" fileName="images/fzd_diban_1.png" xy="0,1"/>
@@ -22,16 +23,16 @@
     <image id="n50_9cth" name="n50" src="9cth60" fileName="images/fzd_xiant_1.png" xy="0,439"/>
     <text id="n32_hinb" name="txtOwned" xy="148,637" size="115,34" fontSize="24" color="#ac9d75" align="center" vars="true" text="已拥有：{v1=0}"/>
     <component id="n20_hinb" name="btnBuy" src="hinb5q" fileName="components/Button6.xml" pkg="eg2y0ldp" xy="51,676"/>
-    <loader id="n47_ugdz" name="iconPrice" xy="102,702" size="34,34" group="n46_hinb" touchable="false" url="ui://eg2y0ldpq08x3" fill="scale">
+    <loader id="n47_ugdz" name="iconPrice" xy="167,702" size="34,34" group="n46_hinb" touchable="false" url="ui://eg2y0ldpq08x3" fill="scale">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </loader>
-    <text id="n48_ugdz" name="txtPrice" xy="136,698" size="96,41" group="n46_hinb" fontSize="30" color="#f2efff" autoClearText="true" text="99999">
+    <text id="n48_ugdz" name="txtPrice" xy="201,698" size="96,41" group="n46_hinb" fontSize="30" color="#f2efff" autoClearText="true" text="99999">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </text>
-    <text id="n45_hinb" name="txtBtnBuy" xy="232,690" size="76,49" group="n46_hinb" fontSize="36" color="#fff7e4" strokeColor="#ac904e" strokeSize="2" text="购买">
-      <gearText controller="c1" pages="6,7" values="兑换|兑换" default="购买"/>
+    <text id="n45_hinb" name="txtBtnBuy" xy="167,690" size="76,49" group="n46_hinb" fontSize="36" color="#fff7e4" strokeColor="#ac904e" strokeSize="2" text="兑换">
+      <gearText controller="c1" pages="6,7,10" values="兑换|兑换|兑换" default="购买"/>
     </text>
-    <group id="n46_hinb" name="n46" xy="102,690" size="206,49" advanced="true" layout="hz" excludeInvisibles="true">
+    <group id="n46_hinb" name="n46" xy="167,690" size="76,49" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <list id="n53_ih75" name="listTag" xy="41,490" size="333,130" layout="flow_hz" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" autoClearItems="true">

FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,47">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8," selected="7">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9," selected="8">
     <remark page="2" value="抽卡兑换"/>
     <remark page="3" value="抽卡活动兑换"/>
     <remark page="4" value="抽卡"/>
     <remark page="5" value="卡牌"/>
     <remark page="6" value="分解"/>
     <remark page="7" value="千山万水"/>
+    <remark page="8" value="画廊积分兑换"/>
   </controller>
   <displayList>
     <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
@@ -44,10 +45,15 @@
       <gearXY controller="c1" pages="0,1,5,6,8" values="814,2|684,2|684,2|684,2|688,5" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,2">
+    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="8"/>
       <gearXY controller="c1" pages="0,1,5,6,8" values="814,2|684,2|684,2|684,2|814,2" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
+    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,2">
+      <gearDisplay controller="c1" pages="9"/>
+      <gearXY controller="c1" pages="0,1,5,6,8,9" values="814,2|684,2|684,2|684,2|814,2|814,2" default="688,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x5"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/poem/PoemGalleryUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="1,,2," selected="1"/>
+  <controller name="c1" pages="1,,2," selected="0"/>
   <displayList>
     <loader id="n0_r9ri" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
@@ -16,13 +16,13 @@
       <gearDisplay controller="c1" pages="2"/>
     </component>
     <component id="n2_r9ri" name="btnRecover" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="96,1716" size="77,76">
-      <Button title="首页" icon="ui://iyz778gkuyuxzp"/>
+      <Button title="首页" icon="ui://iyz778gkuyuxzp" controller="c1" page="1"/>
     </component>
     <component id="n3_r9ri" name="btnJoin" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="504,1712" size="77,76">
       <Button title="投稿" icon="ui://iyz778gkuyuxzp"/>
     </component>
-    <component id="n4_r9ri" name="btnFavorite" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="857,1713" size="77,76">
-      <Button title="收藏" icon="ui://iyz778gkuyuxzp"/>
+    <component id="n4_r9ri" name="btnFavorites" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="857,1713" size="77,76">
+      <Button title="收藏" icon="ui://iyz778gkuyuxzp" controller="c1" page="2"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/poem/package.xml

@@ -57,7 +57,7 @@
     <component id="r9ri10x" name="ComRank.xml" path="/componentsGallery/"/>
     <component id="r9ri10y" name="ListRankItem.xml" path="/componentsGallery/"/>
     <component id="r9ri114" name="ComNormal.xml" path="/componentsGallery/"/>
-    <component id="r9ri115" name="ComFavorite.xml" path="/componentsGallery/"/>
+    <component id="r9ri115" name="ComFavorites.xml" path="/componentsGallery/"/>
     <component id="r9ri116" name="PoemGalleryPreviewUI.xml" path="/" exported="true"/>
     <component id="r9ri117" name="PoemGalleryRewardUI.xml" path="/" exported="true"/>
     <component id="r9ri118" name="ListRankRewardItem.xml" path="/componentsGallery/"/>

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -151,6 +151,14 @@ namespace GFGEditor
                     return "FU_ZHUANG_DIAN=" + ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID;
                 }
             }
+            ShopCfg[] shopCfgGallerys = ShopCfgGalleryArray.Instance.dataArray;
+            foreach (ShopCfg cfg in shopCfgGallerys)
+            {
+                if (cfg.itemID == itemId)
+                {
+                    return "FU_ZHUANG_DIAN=" + ConstStoreId.GALLERY_STORE_ID;
+                }
+            }
             return null;
         }
         /// <summary>

GameClient/Assets/Game/HotUpdate/Constant/ConstStoreId.cs

@@ -8,6 +8,7 @@ namespace GFGGame
         public const int CLOTHING_STORE_ID = 1;//服装店
         public const int LUCKY_BOX_STORE_ID = 2;//抽卡兑换商店
         public const int LUCKY_BOX_ACTIVITY_STORE_ID = 3;//抽卡活动兑换商店
+        public const int GALLERY_STORE_ID = 4;//画廊积分兑换商店
         public const int DIAMOND_STORE_ID = 1;//钻石商店
 
         public const string DIAMOND_STORE_TITLE = "钻石商城";//钻石商店

GameClient/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using ET;
+using FairyGUI;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class PoemGalleryDataManager : SingletonBase<PoemGalleryDataManager>
+    {
+        /// <summary>
+        /// 推荐数据
+        /// </summary>
+        /// <typeparam name="PoemGalleryData"></typeparam>
+        /// <returns></returns>
+        public List<PoemGalleryData> RecommendInfos = new List<PoemGalleryData>();
+
+        /// <summary>
+        /// 好友数据
+        /// </summary>
+        /// <typeparam name="PoemGalleryData"></typeparam>
+        /// <returns></returns>
+        public List<PoemGalleryData> FrinedInfos = new List<PoemGalleryData>();
+
+        /// <summary>
+        /// 收藏数据
+        /// </summary>
+        /// <typeparam name="PoemGalleryData"></typeparam>
+        /// <returns></returns>
+        public List<PoemGalleryData> FavoriteInfos = new List<PoemGalleryData>();
+
+        /// <summary>
+        /// 我的作品数据
+        /// </summary>
+        /// <typeparam name="PoemGalleryData"></typeparam>
+        /// <returns></returns>
+        public List<PoemGalleryData> MySelfInfos = new List<PoemGalleryData>();
+
+        public void Clear()
+        {
+            RecommendInfos.Clear();
+            FrinedInfos.Clear();
+            FavoriteInfos.Clear();
+            MySelfInfos.Clear();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemGalleryRankUI.cs.meta → GameClient/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 06648f8c103829843a770b8b031d49ac
+guid: 80e776dc0474b9640ae1382cb4a4b90d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Data/VO/PoemGalleryData.cs

@@ -0,0 +1,66 @@
+using System.Collections.Generic;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class PoemGalleryData
+    {
+        /// <summary>
+        /// 图片id
+        /// </summary>
+        public long PictureId;
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public long CreationTime;
+
+        /// <summary>
+        /// 置顶状态
+        /// </summary>
+        public bool ToppingStatus;
+
+        /// <summary>
+        /// 锁定状态
+        /// </summary>
+        public bool LockingStatus;
+        /// <summary>
+        /// 来源
+        /// </summary>
+        public int SourceType;
+
+
+        /// <summary>
+        /// 个人相册_照片临时下载路径,出于流量安全,每个下载文件的路径都是限时的,暂限5MIN
+        /// </summary>
+        public string PictureTempUrl;
+        /// <summary>
+        /// 个人相册_照片数据
+        /// </summary>
+        public byte[] Bytes;
+        /// <summary>
+        /// 个人相册_照片资源
+        /// </summary>
+        public NTexture Ntexture;//个人相册数据
+
+
+        /// <summary>
+        /// 万水千山_游历地点id
+        /// </summary>
+        public int TravelLocationId;
+        /// <summary>
+        /// Q版套装位置,0表示无人物的风景图
+        /// </summary>
+        public int TravelSuitId;
+        /// <summary>
+        /// Q版套装人物资源下标
+        /// </summary>
+        public int SuitResIndex;
+        /// <summary>
+        /// Q版人物位置下标
+        /// </summary>
+        public int PositionIndex;
+
+
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFavorite.cs.meta → GameClient/Assets/Game/HotUpdate/Data/VO/PoemGalleryData.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c3a12538f61266940be014e88ed77127
+guid: 080d99d95d5dfc2479525c1ce2e3a709
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/ClothingShopCfgManager.cs

@@ -17,11 +17,13 @@ namespace GFGGame
                     break;
                 case ConstStoreId.LUCKY_BOX_STORE_ID:
                     shopCfgs = ShopCfgCJArray.Instance.GetCfgsBytypeIndex(typeIndex);
-
                     break;
                 case ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID:
                     shopCfgs = ShopCfgCJAArray.Instance.GetCfgsBytypeIndex(typeIndex);
                     break;
+                case ConstStoreId.GALLERY_STORE_ID:
+                    shopCfgs = ShopCfgGalleryArray.Instance.GetCfgsBytypeIndex(typeIndex);
+                    break;
             }
             SortItemListByScore(shopCfgs, scoreType);
             return shopCfgs;
@@ -32,12 +34,17 @@ namespace GFGGame
             switch (shopType)
             {
                 case ConstStoreId.CLOTHING_STORE_ID:
+
                     return ShopCfgClothingArray.Instance.GetCfg(buyId);
                 case ConstStoreId.LUCKY_BOX_STORE_ID:
 
                     return ShopCfgCJArray.Instance.GetCfg(buyId);
                 case ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID:
+
                     return ShopCfgCJAArray.Instance.GetCfg(buyId);
+                case ConstStoreId.GALLERY_STORE_ID:
+
+                    return ShopCfgGalleryArray.Instance.GetCfg(buyId);
             }
             return null;
         }
@@ -52,7 +59,11 @@ namespace GFGGame
 
                     return ShopCfgCJArray.Instance.dataArray;
                 case ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID:
+
                     return ShopCfgCJAArray.Instance.dataArray;
+                case ConstStoreId.GALLERY_STORE_ID:
+
+                    return ShopCfgGalleryArray.Instance.dataArray;
             }
             return null;
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs

@@ -16,6 +16,7 @@ namespace UI.CommonGame
         public GButton m_btnDiamondRed;
         public GButton m_btnDiamondPurple;
         public GButton m_btnTravel;
+        public GButton m_btnGallery;
         public const string URL = "ui://eg2y0ldpv3541v";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComponentValueBar";
@@ -72,6 +73,7 @@ namespace UI.CommonGame
             m_btnDiamondRed = (GButton)comp.GetChild("btnDiamondRed");
             m_btnDiamondPurple = (GButton)comp.GetChild("btnDiamondPurple");
             m_btnTravel = (GButton)comp.GetChild("btnTravel");
+            m_btnGallery = (GButton)comp.GetChild("btnGallery");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -84,6 +86,7 @@ namespace UI.CommonGame
             m_btnDiamondRed = null;
             m_btnDiamondPurple = null;
             m_btnTravel = null;
+            m_btnGallery = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFavorite.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFavorites.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.Poem
 {
-    public partial class UI_ComFavorite
+    public partial class UI_ComFavorites
     {
         public GComponent target;
         public Controller m_c1;
@@ -14,12 +14,12 @@ namespace UI.Poem
         public GList m_listMySelf;
         public const string URL = "ui://iyz778gkr9ri115";
         public const string PACKAGE_NAME = "Poem";
-        public const string RES_NAME = "ComFavorite";
-        private static UI_ComFavorite _proxy;
+        public const string RES_NAME = "ComFavorites";
+        private static UI_ComFavorites _proxy;
 
-        public static UI_ComFavorite Create(GObject gObject = null)
+        public static UI_ComFavorites Create(GObject gObject = null)
         {
-            var ui = new UI_ComFavorite();
+            var ui = new UI_ComFavorites();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -28,11 +28,11 @@ namespace UI.Poem
             return ui;
         }
 
-        public static UI_ComFavorite Proxy(GObject gObject = null)
+        public static UI_ComFavorites Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComFavorite();
+                _proxy = new UI_ComFavorites();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFavorites.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9c66e294d44593845a3be2347993c388
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -17,6 +17,7 @@ namespace UI.Poem
         public GTextField m_txtTheme;
         public GList m_listRecommend;
         public GList m_listFriend;
+        public GList m_listRank;
         public const string URL = "ui://iyz778gkr9ri114";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ComNormal";
@@ -74,6 +75,7 @@ namespace UI.Poem
             m_txtTheme = (GTextField)comp.GetChild("txtTheme");
             m_listRecommend = (GList)comp.GetChild("listRecommend");
             m_listFriend = (GList)comp.GetChild("listFriend");
+            m_listRank = (GList)comp.GetChild("listRank");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -87,6 +89,7 @@ namespace UI.Poem
             m_txtTheme = null;
             m_listRecommend = null;
             m_listFriend = null;
+            m_listRank = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,92 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Poem
-{
-    public partial class UI_PoemGalleryRankUI
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaBg;
-        public GButton m_btnback;
-        public GTextField m_txtTheme;
-        public GList m_list;
-        public GComponent m_comHead;
-        public GTextField m_txtName;
-        public GTextField m_txtRank;
-        public const string URL = "ui://iyz778gkr9ri10x";
-        public const string PACKAGE_NAME = "Poem";
-        public const string RES_NAME = "PoemGalleryRankUI";
-        private static UI_PoemGalleryRankUI _proxy;
-
-        public static UI_PoemGalleryRankUI Create(GObject gObject = null)
-        {
-            var ui = new UI_PoemGalleryRankUI();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_PoemGalleryRankUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_PoemGalleryRankUI();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_c1 = comp.GetController("c1");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnback = (GButton)comp.GetChild("btnback");
-            m_txtTheme = (GTextField)comp.GetChild("txtTheme");
-            m_list = (GList)comp.GetChild("list");
-            m_comHead = (GComponent)comp.GetChild("comHead");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtRank = (GTextField)comp.GetChild("txtRank");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_loaBg = null;
-            m_btnback = null;
-            m_txtTheme = null;
-            m_list = null;
-            m_comHead = null;
-            m_txtName = null;
-            m_txtRank = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -11,10 +11,10 @@ namespace UI.Poem
         public GLoader m_loaBg;
         public GButton m_btnback;
         public UI_ComNormal m_comNormal;
-        public UI_ComFavorite m_ComFavorite;
+        public UI_ComFavorites m_ComFavorite;
         public GButton m_btnRecover;
         public GButton m_btnJoin;
-        public GButton m_btnFavorite;
+        public GButton m_btnFavorites;
         public const string URL = "ui://iyz778gkr9ri10u";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemGalleryUI";
@@ -66,10 +66,10 @@ namespace UI.Poem
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comNormal = (UI_ComNormal)UI_ComNormal.Create(comp.GetChild("comNormal"));
-            m_ComFavorite = (UI_ComFavorite)UI_ComFavorite.Create(comp.GetChild("ComFavorite"));
+            m_ComFavorite = (UI_ComFavorites)UI_ComFavorites.Create(comp.GetChild("ComFavorite"));
             m_btnRecover = (GButton)comp.GetChild("btnRecover");
             m_btnJoin = (GButton)comp.GetChild("btnJoin");
-            m_btnFavorite = (GButton)comp.GetChild("btnFavorite");
+            m_btnFavorites = (GButton)comp.GetChild("btnFavorites");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -82,7 +82,7 @@ namespace UI.Poem
             m_ComFavorite = null;
             m_btnRecover = null;
             m_btnJoin = null;
-            m_btnFavorite = null;
+            m_btnFavorites = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,18 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using ET;
+using FairyGUI;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace GFGGame
+{
+    public static class PoemGallerySProxy
+    {
+
+    }
+
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8d10a9a033b342a47acf068d5b37c1ec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -182,6 +182,10 @@ namespace GFGGame
             {
                 _valueBarController.Controller(3);
             }
+            else if (_storeId == ConstStoreId.GALLERY_STORE_ID)
+            {
+                _valueBarController.Controller(8);
+            }
             if (_selectedItemId > 0 && _selectedItemCount > 0)
             {
                 ShopDataManager.Instance.BuyItem(_cfgSelected.id, _selectedItemCount, _storeId, _cfgSelected);

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

@@ -115,6 +115,10 @@ namespace GFGGame
                 {
                     listItem.m_txtSourceName.text = "落星商店";
                 }
+                else if (shopId == ConstStoreId.GALLERY_STORE_ID)
+                {
+                    listItem.m_txtSourceName.text = "画廊商店";
+                }
                 else
                 {
                     listItem.m_txtSourceName.text = "服装店";

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

@@ -27,6 +27,15 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+
+            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnRecover.onClick.Add(OnBtnRecoverClick);
+            _ui.m_btnJoin.onClick.Add(OnBtnJoinClick);
+            _ui.m_btnFavorites.onClick.Add(OnBtnFavoritesClick);
+
+            _ui.m_comNormal.m_btnShop.onClick.Add(OnBtnShopClick);
+            _ui.m_comNormal.m_btnRecommend.onClick.Add(OnBtnRecommendClick);
+            _ui.m_comNormal.m_btnNewest.onClick.Add(OnBtnNewestClick);
         }
         protected override void AddEventListener()
         {
@@ -50,5 +59,46 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(PoemGalleryView).FullName);
+        }
+
+        //首页
+        private void OnBtnRecoverClick()
+        {
+
+        }
+
+        //投稿
+        private void OnBtnJoinClick()
+        {
+
+        }
+
+        //收藏夹
+        private void OnBtnFavoritesClick()
+        {
+
+        }
+
+        //积分商店
+        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()
+        {
+
+        }
     }
 }

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

@@ -31,6 +31,7 @@ namespace GFGGame
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_comphoto.target.onClick.Add(OnComPhotoClick);
+            _ui.m_comGallery.target.onClick.Add(OnComGalleryClick);
         }
         protected override void AddEventListener()
         {
@@ -42,6 +43,7 @@ namespace GFGGame
             base.OnShown();
 
             _ui.m_comphoto.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name) ? 1 : 0;
+            _ui.m_comGallery.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemGalleryView).Name) ? 1 : 0;
         }
 
         protected override void OnHide()
@@ -64,5 +66,9 @@ namespace GFGGame
         {
             ViewManager.Show<PoemPhotoView>(null, new object[] { typeof(PoemView).FullName, this.viewData });
         }
+        private void OnComGalleryClick()
+        {
+            ViewManager.Show<PoemGalleryView>(null, new object[] { typeof(PoemView).FullName, this.viewData });
+        }
     }
 }