画廊

FGUIProject/assets/ClothingShop/GalleryShopUI.xml

@@ -4,31 +4,28 @@
     <loader id="n27_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"/>
     </loader>
-    <loader id="n34_r9ri" name="loaBgRes" xy="295,724" pivot="0.5,0.5" anchor="true" size="477,847" aspect="true" touchable="false" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
     <component id="n1_yd72" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
       <property target="loaTitle" propertyId="1" value="ui://e5hnfx8ar9rieg"/>
     </component>
     <component id="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,105" controller="c1,9"/>
-    <component id="n25_r9ri" name="comRes" src="r9riej" fileName="components/ComRes.xml" xy="270,759" pivot="0.5,0.5" anchor="true" scale="0.5,0.5">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </component>
     <image id="n19_r9ri" name="n19" src="r9rieh" fileName="images/jfsc_dik.png" xy="625,0">
       <relation target="" sidePair="height-height,bottom-middle"/>
     </image>
-    <image id="n22_r9ri" name="n22" src="r9ri6r" fileName="images/jfsc_xiantiao_1.png" xy="665,381" group="n21_r9ri"/>
-    <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="706,646" group="n21_r9ri">
+    <image id="n22_r9ri" name="n22" src="r9ri6r" fileName="images/jfsc_xiantiao_1.png" xy="665,371" group="n21_r9ri"/>
+    <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="706,636" group="n21_r9ri">
       <Button title="兑换"/>
     </component>
-    <text id="n23_r9ri" name="txtName" xy="680,320" size="216,59" group="n21_r9ri" font="ui://eg2y0ldpwonotja" fontSize="44" color="#b0884e" letterSpacing="-2" text="孔雀东南飞"/>
-    <text id="n24_r9ri" name="txtDesc" xy="679,400" size="319,185" group="n21_r9ri" fontSize="28" color="#af9a7d" letterSpacing="-2" autoSize="none" text="这是一件套装这是一件套装"/>
-    <group id="n21_r9ri" name="n21" xy="665,320" size="365,407" advanced="true">
+    <text id="n23_r9ri" name="txtName" xy="680,310" size="216,59" group="n21_r9ri" font="ui://eg2y0ldpwonotja" fontSize="44" color="#b0884e" letterSpacing="-2" text="孔雀东南飞"/>
+    <text id="n24_r9ri" name="txtDesc" xy="679,390" size="319,185" group="n21_r9ri" fontSize="28" color="#af9a7d" letterSpacing="-2" autoSize="none" text="这是一件套装这是一件套装"/>
+    <group id="n21_r9ri" name="n21" xy="665,310" size="365,407" advanced="true">
       <relation target="n19_r9ri" sidePair="bottom-bottom"/>
     </group>
+    <loader id="n28_r9ri" name="loaIcon" xy="74,289" pivot="0.5,0.5" size="472,472" fill="scale">
+      <relation target="" sidePair="middle-middle"/>
+    </loader>
     <component id="n5_7dea" name="comItemList" src="r9ri65" fileName="components/ComItemList.xml" xy="0,1162">
-      <relation target="" sidePair="center-center,bottom-bottom"/>
+      <relation target="" sidePair="height-height,center-center,bottom-bottom"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/ClothingShop/components/ComItem.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="142,142" opaque="false">
+<component size="1000,1000" opaque="false">
   <displayList>
-    <loader id="n29_r9ri" name="loaItem0" xy="0,0" pivot="0.5,0.5" size="142,142" group="n32_r9ri" url="ui://mbo439wbih753e" autoSize="true"/>
-    <loader id="n30_r9ri" name="loaItem1" xy="0,0" pivot="0.5,0.5" size="142,142" group="n32_r9ri" url="ui://mbo439wbih753e" autoSize="true"/>
-    <loader id="n31_r9ri" name="loaItem2" xy="0,0" pivot="0.5,0.5" size="142,142" group="n32_r9ri" url="ui://mbo439wbih753e" autoSize="true"/>
-    <group id="n32_r9ri" name="grpItem" xy="0,0" size="142,142" advanced="true"/>
+    <loader id="n29_r9ri" name="loaItem0" xy="0,0" pivot="0.5,0.5" size="1000,1000" group="n32_r9ri" url="ui://mbo439wbih753e" fill="scale"/>
+    <loader id="n30_r9ri" name="loaItem1" xy="174,0" pivot="0.5,0.5" size="142,142" group="n32_r9ri" url="ui://mbo439wbih753e" autoSize="true"/>
+    <loader id="n31_r9ri" name="loaItem2" xy="174,0" pivot="0.5,0.5" size="142,142" group="n32_r9ri" url="ui://mbo439wbih753e" autoSize="true"/>
+    <group id="n32_r9ri" name="grpItem" xy="0,0" size="1000,1000" advanced="true"/>
   </displayList>
   <relation target="n32_r9ri" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/ClothingShop/components/ComItemList.xml

@@ -5,6 +5,7 @@
     <image id="n15_xmtl" name="n15" src="r9ri66" fileName="images/pz_dktu_1.png" xy="0,0"/>
     <component id="n9_7dea" name="comBtnTab" src="r9ri67" fileName="components/Component3.xml" xy="0,-11"/>
     <list id="n8_7dea" name="list" xy="17,114" size="1045,644" layout="flow_hz" overflow="scroll" lineGap="14" colGap="15" defaultItem="ui://e5hnfx8ar9rief">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingShop/components/ComRes.xml

@@ -2,16 +2,22 @@
 <component size="1080,1920" opaque="false">
   <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
-    <loader id="n26_r9ri" name="loaBg" xy="161,889" pivot="0.5,0.5" size="1080,142" url="ui://mbo439wbih753e" align="center" vAlign="middle" fill="scaleMatchWidth">
+    <loader id="n26_r9ri" name="loaBg" xy="79,460" pivot="0.5,0.5" size="1000,1000" url="ui://mbo439wbih753e" align="center" vAlign="middle" fill="scale">
       <gearDisplay controller="c1" pages="0"/>
     </loader>
-    <loader id="n27_r9ri" name="loaNpc" xy="611,889" pivot="0.5,0.5" size="142,142" url="ui://mbo439wbih753e" autoSize="true">
+    <loader id="n27_r9ri" name="loaNpc" xy="80,460" pivot="0.5,0.5" size="1000,1000" aspect="true" url="ui://mbo439wbih753e" fill="scale">
       <gearDisplay controller="c1" pages="1"/>
     </loader>
-    <component id="n29_r9ri" name="comItem" src="r9ri6s" fileName="components/ComItem.xml" xy="0,0" pivot="0.5,0.5">
+    <loader id="n33_r9ri" name="loaItem0" xy="-39,381" pivot="0.5,0.5" size="1000,1000" url="ui://mbo439wbih753e" fill="scale">
       <gearDisplay controller="c1" pages="2"/>
-    </component>
-    <loader id="n32_r9ri" name="loaBorder" xy="556,743" pivot="0.5,0.5" size="142,142" url="ui://mbo439wbih753e" autoSize="true">
+    </loader>
+    <loader id="n34_r9ri" name="loaItem1" xy="135,381" pivot="0.5,0.5" size="142,142" url="ui://mbo439wbih753e" autoSize="true">
+      <gearDisplay controller="c1" pages="2"/>
+    </loader>
+    <loader id="n35_r9ri" name="loaItem2" xy="135,381" pivot="0.5,0.5" size="142,142" url="ui://mbo439wbih753e" autoSize="true">
+      <gearDisplay controller="c1" pages="2"/>
+    </loader>
+    <loader id="n32_r9ri" name="loaBorder" xy="77,460" pivot="0.5,0.5" size="1000,1000" aspect="true" url="ui://mbo439wbih753e">
       <gearDisplay controller="c1" pages="3"/>
     </loader>
   </displayList>

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -13,14 +13,6 @@
     </loader>
     <component id="n9_g3xa" name="comSelectBox" src="g3xa4l" fileName="components/ComChecked.xml" xy="420,728" pivot="0.5,0.5" anchor="true"/>
     <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n18_r9ri" name="btnGalleryJoin" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="369,1770">
-      <gearDisplay controller="c1" pages="1"/>
-      <relation target="" sidePair="bottom-bottom"/>
-      <Button title="确认上传" icon="ui://eg2y0ldpr9ritjd"/>
-    </component>
-    <component id="n5_7dea" name="ComSelectRes" src="7dea4f" fileName="components/ComItemList.xml" xy="0,1162">
-      <relation target="" sidePair="center-center,bottom-bottom"/>
-    </component>
     <component id="n10_i3ix" name="btnPhotograph" src="g3xa4h" fileName="components/Button8.xml" xy="940,409" group="n16_9ico">
       <gearDisplay controller="c1" pages="0"/>
       <Button icon="ui://mbo439wbnz0t5d"/>
@@ -37,5 +29,18 @@
     <group id="n16_9ico" name="n16" xy="940,409" size="125,415" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
+    <component id="n5_7dea" name="ComSelectRes" src="7dea4f" fileName="components/ComItemList.xml" xy="0,1162">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </component>
+    <component id="n18_r9ri" name="btnGalleryJoin" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="369,1728">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button title="确认上传" icon="ui://eg2y0ldpr9ritjd"/>
+    </component>
+    <image id="n19_r9ri" name="n19" src="r9riek" fileName="images/hl_ciskuang.png" xy="480,1834" group="n21_r9ri"/>
+    <text id="n20_r9ri" name="txtCount" xy="501,1831" pivot="0.5,0" size="77,42" group="n21_r9ri" fontSize="30" color="#e3d3ae" text="3/10"/>
+    <group id="n21_r9ri" name="n21" xy="480,1831" size="120,42" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/DressUp/package.xml

@@ -180,6 +180,7 @@
     <image id="r9riec" name="pz_zi_4.png" path="/images/"/>
     <image id="r9ried" name="pz_zi_5.png" path="/images/"/>
     <image id="r9riei" name="jfsc_xiantiao_1.png" path="/images/"/>
+    <image id="r9riek" name="hl_ciskuang.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComItem.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.ClothingShop
-{
-    public partial class UI_ComItem
-    {
-        public GComponent target;
-        public GLoader m_loaItem0;
-        public GLoader m_loaItem1;
-        public GLoader m_loaItem2;
-        public GGroup m_grpItem;
-        public const string URL = "ui://e5hnfx8ar9ri6s";
-        public const string PACKAGE_NAME = "ClothingShop";
-        public const string RES_NAME = "ComItem";
-        private static UI_ComItem _proxy;
-
-        public static UI_ComItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ComItem();
-            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_ComItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComItem();
-            }
-            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_loaItem0 = (GLoader)comp.GetChild("loaItem0");
-            m_loaItem1 = (GLoader)comp.GetChild("loaItem1");
-            m_loaItem2 = (GLoader)comp.GetChild("loaItem2");
-            m_grpItem = (GGroup)comp.GetChild("grpItem");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaItem0 = null;
-            m_loaItem1 = null;
-            m_loaItem2 = null;
-            m_grpItem = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComRes.cs

@@ -1,84 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.ClothingShop
-{
-    public partial class UI_ComRes
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaBg;
-        public GLoader m_loaNpc;
-        public UI_ComItem m_comItem;
-        public GLoader m_loaBorder;
-        public const string URL = "ui://e5hnfx8ar9riej";
-        public const string PACKAGE_NAME = "ClothingShop";
-        public const string RES_NAME = "ComRes";
-        private static UI_ComRes _proxy;
-
-        public static UI_ComRes Create(GObject gObject = null)
-        {
-            var ui = new UI_ComRes();
-            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_ComRes Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComRes();
-            }
-            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_loaNpc = (GLoader)comp.GetChild("loaNpc");
-            m_comItem = (UI_ComItem)UI_ComItem.Create(comp.GetChild("comItem"));
-            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_loaBg = null;
-            m_loaNpc = null;
-            m_comItem.Dispose();
-            m_comItem = null;
-            m_loaBorder = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComRes.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_GalleryShopUI.cs

@@ -8,13 +8,12 @@ namespace UI.ClothingShop
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GLoader m_loaBgRes;
         public GButton m_btnBack;
         public GComponent m_valueBar;
-        public UI_ComRes m_comRes;
         public GButton m_btnBuy;
         public GTextField m_txtName;
         public GTextField m_txtDesc;
+        public GLoader m_loaIcon;
         public UI_ComItemList m_comItemList;
         public const string URL = "ui://e5hnfx8ar9riee";
         public const string PACKAGE_NAME = "ClothingShop";
@@ -64,26 +63,23 @@ namespace UI.ClothingShop
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_loaBgRes = (GLoader)comp.GetChild("loaBgRes");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_comRes = (UI_ComRes)UI_ComRes.Create(comp.GetChild("comRes"));
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_comItemList = (UI_ComItemList)UI_ComItemList.Create(comp.GetChild("comItemList"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_loaBgRes = null;
             m_btnBack = null;
             m_valueBar = null;
-            m_comRes.Dispose();
-            m_comRes = null;
             m_btnBuy = null;
             m_txtName = null;
             m_txtDesc = null;
+            m_loaIcon = null;
             m_comItemList.Dispose();
             m_comItemList = null;
             if(disposeTarget && target != null)

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

@@ -13,12 +13,13 @@ namespace UI.DressUp
         public GLoader m_loaGuide1;
         public UI_ComChecked m_comSelectBox;
         public GButton m_btnBack;
-        public GButton m_btnGalleryJoin;
-        public UI_ComItemList m_ComSelectRes;
         public GButton m_btnPhotograph;
         public GButton m_btnChoose;
         public GButton m_btnUp;
         public GButton m_btnDown;
+        public UI_ComItemList m_ComSelectRes;
+        public GButton m_btnGalleryJoin;
+        public GTextField m_txtCount;
         public const string URL = "ui://mbo439wbbe944a";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "PhotographUI";
@@ -72,12 +73,13 @@ namespace UI.DressUp
             m_loaGuide1 = (GLoader)comp.GetChild("loaGuide1");
             m_comSelectBox = (UI_ComChecked)UI_ComChecked.Create(comp.GetChild("comSelectBox"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btnGalleryJoin = (GButton)comp.GetChild("btnGalleryJoin");
-            m_ComSelectRes = (UI_ComItemList)UI_ComItemList.Create(comp.GetChild("ComSelectRes"));
             m_btnPhotograph = (GButton)comp.GetChild("btnPhotograph");
             m_btnChoose = (GButton)comp.GetChild("btnChoose");
             m_btnUp = (GButton)comp.GetChild("btnUp");
             m_btnDown = (GButton)comp.GetChild("btnDown");
+            m_ComSelectRes = (UI_ComItemList)UI_ComItemList.Create(comp.GetChild("ComSelectRes"));
+            m_btnGalleryJoin = (GButton)comp.GetChild("btnGalleryJoin");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -88,13 +90,14 @@ namespace UI.DressUp
             m_comSelectBox.Dispose();
             m_comSelectBox = null;
             m_btnBack = null;
-            m_btnGalleryJoin = null;
-            m_ComSelectRes.Dispose();
-            m_ComSelectRes = null;
             m_btnPhotograph = null;
             m_btnChoose = null;
             m_btnUp = null;
             m_btnDown = null;
+            m_ComSelectRes.Dispose();
+            m_ComSelectRes = null;
+            m_btnGalleryJoin = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -64,8 +64,8 @@ namespace GFGGame
                 yield return request.SendWebRequest();
                 if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError)
                 {
-                    PromptController.Instance.ShowFloatTextPrompt("下载失败");
                     DownloadFile(pictureTempUrl, callback);
+                    // PromptController.Instance.ShowFloatTextPrompt("下载失败");
                     // yield return null;
                 }
                 else

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

@@ -160,8 +160,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CLOTHING_SHOP_VIEW);
-            this.Hide();
+            ViewManager.GoBackFrom(typeof(GalleryShopView).FullName);
 
         }
 
@@ -256,76 +255,80 @@ namespace GFGGame
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemID);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
-            _ui.m_loaBgRes.visible = false;
-            _ui.m_comRes.m_loaBg.visible = false;
-            _ui.m_comRes.m_c1.selectedIndex = _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex;
-            switch (_ui.m_comRes.m_c1.selectedIndex)
-            {
-                case GalleryShopTabType.BG:
-                    _ui.m_comRes.m_loaBg.url = ResPathUtil.GetDressUpPath(itemCfg.res, ext);
-                    // _ui.m_loaBgRes.visible = true;
-                    _ui.m_comRes.m_loaBg.visible = true;
-                    break;
-                case GalleryShopTabType.NPC:
-                    _ui.m_comRes.m_loaNpc.url = ResPathUtil.GetNpcPicFPath(itemCfg.res);
-                    break;
-                case GalleryShopTabType.ITEM:
-                    ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
-                    int sortingOrder = typeCfg.defaultLayer;
-
-                    string res = itemCfg.res;
-                    _ui.m_comRes.m_comItem.m_loaItem0.visible = false;
-                    _ui.m_comRes.m_comItem.m_loaItem1.visible = false;
-                    _ui.m_comRes.m_comItem.m_loaItem2.visible = false;
-                    if (!string.IsNullOrEmpty(itemCfg.resLayer1))
-                    {
-                        res = itemCfg.resLayer1 == "n" ? res : string.Format("{0}_{1}", res, itemCfg.resLayer1);
-                        string resPath = ResPathUtil.GetDressUpPath(res, ext);
-                        // Texture2D texture2D = GFGAsset.Load<Texture2D>(resPath);
-                        // _ui.m_comRes.m_loaItem0.texture = new NTexture(texture2D); ;
-                        _ui.m_comRes.m_comItem.m_loaItem0.url = resPath;
-                        float tx, ty;
-                        DressUpUtil.LoadSpritePos(resPath, out tx, out ty);
-                        _ui.m_comRes.m_comItem.m_loaItem0.SetXY(tx, ty);
-                        _ui.m_comRes.m_comItem.m_loaItem0.visible = true;
-                        _ui.m_comRes.m_comItem.m_loaItem0.sortingOrder = sortingOrder;
-                    }
-                    if (!string.IsNullOrEmpty(itemCfg.resLayer2))
-                    {
-                        sortingOrder = typeCfg.specialLayer;
-                        res = itemCfg.resLayer2 == "n" ? res : string.Format("{0}_{1}", res, itemCfg.resLayer2);
-                        string resPath = ResPathUtil.GetDressUpPath(res, ext);
-                        // Texture2D texture2D = GFGAsset.Load<Texture2D>(resPath);
-                        // _ui.m_comRes.m_loaItem1.texture = new NTexture(texture2D); ;
-                        _ui.m_comRes.m_comItem.m_loaItem1.url = resPath;
-                        float tx, ty;
-                        DressUpUtil.LoadSpritePos(resPath, out tx, out ty);
-                        _ui.m_comRes.m_comItem.m_loaItem1.SetXY(tx, ty);
-                        _ui.m_comRes.m_comItem.m_loaItem1.visible = true;
-                        _ui.m_comRes.m_comItem.m_loaItem1.sortingOrder = sortingOrder;
-                    }
-                    if (!string.IsNullOrEmpty(itemCfg.resLayer3))
-                    {
-                        sortingOrder = typeCfg.thirdlLayer;
-                        res = itemCfg.resLayer3 == "n" ? res : string.Format("{0}_{1}", res, itemCfg.resLayer3);
-                        string resPath = ResPathUtil.GetDressUpPath(res, ext);
-                        // Texture2D texture2D = GFGAsset.Load<Texture2D>(res);
-                        // _ui.m_comRes.m_loaItem2.texture = new NTexture(texture2D);
-                        _ui.m_comRes.m_comItem.m_loaItem2.url = resPath;
-                        float tx, ty;
-                        DressUpUtil.LoadSpritePos(resPath, out tx, out ty);
-                        _ui.m_comRes.m_comItem.m_loaItem2.SetXY(tx, ty);
-                        _ui.m_comRes.m_comItem.m_loaItem2.visible = true;
-                        _ui.m_comRes.m_comItem.m_loaItem2.sortingOrder = sortingOrder;
-                    }
-                    _ui.m_comRes.m_comItem.target.SetSize(_ui.m_comRes.m_comItem.m_grpItem.width, _ui.m_comRes.m_comItem.m_grpItem.height);
-                    break;
-                case GalleryShopTabType.BORDER:
-                    _ui.m_comRes.m_loaBorder.url = ResPathUtil.GetPhotographBorderPath(itemCfg.res);
-                    break;
-                case GalleryShopTabType.EFFECT:
-                    break;
-            }
+            _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg); ;
+            // _ui.m_comRes.m_loaBg.visible = false;
+            // _ui.m_comRes.m_c1.selectedIndex = _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex;
+            // switch (_ui.m_comRes.m_c1.selectedIndex)
+            // {
+            //     case GalleryShopTabType.BG:
+            //         // _ui.m_comRes.m_loaBg.url = ResPathUtil.GetDressUpPath(itemCfg.res, ext);
+            //         _ui.m_comRes.m_loaBg.url = ResPathUtil.GetIconPath(itemCfg); ;
+            //         // _ui.m_loaBgRes.visible = true;
+            //         _ui.m_comRes.m_loaBg.visible = true;
+            //         break;
+            //     case GalleryShopTabType.NPC:
+            //         // _ui.m_comRes.m_loaNpc.url = ResPathUtil.GetNpcPicFPath(itemCfg.res);
+            //         _ui.m_comRes.m_loaNpc.url = ResPathUtil.GetIconPath(itemCfg); ;
+            //         break;
+            //     case GalleryShopTabType.ITEM:
+            //         ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
+            //         int sortingOrder = typeCfg.defaultLayer;
+
+            //         string res = itemCfg.res;
+            //         // _ui.m_comRes.m_comItem.m_loaItem0.visible = false;
+            //         // _ui.m_comRes.m_comItem.m_loaItem1.visible = false;
+            //         // _ui.m_comRes.m_comItem.m_loaItem2.visible = false;
+            //         // _ui.m_comRes.m_comItem.m_loaItem0.url = ResPathUtil.GetIconPath(itemCfg); ;
+            //         // if (!string.IsNullOrEmpty(itemCfg.resLayer1))
+            //         // {
+            //         //     res = itemCfg.resLayer1 == "n" ? res : string.Format("{0}_{1}", res, itemCfg.resLayer1);
+            //         //     string resPath = ResPathUtil.GetDressUpPath(res, ext);
+            //         //     // Texture2D texture2D = GFGAsset.Load<Texture2D>(resPath);
+            //         //     // _ui.m_comRes.m_loaItem0.texture = new NTexture(texture2D); ;
+            //         //     _ui.m_comRes.m_comItem.m_loaItem0.url = resPath;
+            //         //     float tx, ty;
+            //         //     DressUpUtil.LoadSpritePos(resPath, out tx, out ty);
+            //         //     _ui.m_comRes.m_comItem.m_loaItem0.SetXY(tx, ty);
+            //         //     _ui.m_comRes.m_comItem.m_loaItem0.visible = true;
+            //         //     _ui.m_comRes.m_comItem.m_loaItem0.sortingOrder = sortingOrder;
+            //         // }
+            //         // if (!string.IsNullOrEmpty(itemCfg.resLayer2))
+            //         // {
+            //         //     sortingOrder = typeCfg.specialLayer;
+            //         //     res = itemCfg.resLayer2 == "n" ? res : string.Format("{0}_{1}", res, itemCfg.resLayer2);
+            //         //     string resPath = ResPathUtil.GetDressUpPath(res, ext);
+            //         //     // Texture2D texture2D = GFGAsset.Load<Texture2D>(resPath);
+            //         //     // _ui.m_comRes.m_loaItem1.texture = new NTexture(texture2D); ;
+            //         //     _ui.m_comRes.m_comItem.m_loaItem1.url = resPath;
+            //         //     float tx, ty;
+            //         //     DressUpUtil.LoadSpritePos(resPath, out tx, out ty);
+            //         //     _ui.m_comRes.m_comItem.m_loaItem1.SetXY(tx, ty);
+            //         //     _ui.m_comRes.m_comItem.m_loaItem1.visible = true;
+            //         //     _ui.m_comRes.m_comItem.m_loaItem1.sortingOrder = sortingOrder;
+            //         // }
+            //         // if (!string.IsNullOrEmpty(itemCfg.resLayer3))
+            //         // {
+            //         //     sortingOrder = typeCfg.thirdlLayer;
+            //         //     res = itemCfg.resLayer3 == "n" ? res : string.Format("{0}_{1}", res, itemCfg.resLayer3);
+            //         //     string resPath = ResPathUtil.GetDressUpPath(res, ext);
+            //         //     // Texture2D texture2D = GFGAsset.Load<Texture2D>(res);
+            //         //     // _ui.m_comRes.m_loaItem2.texture = new NTexture(texture2D);
+            //         //     _ui.m_comRes.m_comItem.m_loaItem2.url = resPath;
+            //         //     float tx, ty;
+            //         //     DressUpUtil.LoadSpritePos(resPath, out tx, out ty);
+            //         //     _ui.m_comRes.m_comItem.m_loaItem2.SetXY(tx, ty);
+            //         //     _ui.m_comRes.m_comItem.m_loaItem2.visible = true;
+            //         //     _ui.m_comRes.m_comItem.m_loaItem2.sortingOrder = sortingOrder;
+            //         // }
+            //         // _ui.m_comRes.m_comItem.target.SetSize(_ui.m_comRes.m_comItem.m_grpItem.width, _ui.m_comRes.m_comItem.m_grpItem.height);
+            //         break;
+            //     case GalleryShopTabType.BORDER:
+            //         // _ui.m_comRes.m_loaBorder.url = ResPathUtil.GetPhotographBorderPath(itemCfg.res);
+            //         _ui.m_comRes.m_loaBorder.url = ResPathUtil.GetIconPath(itemCfg); ;
+            //         break;
+            //     case GalleryShopTabType.EFFECT:
+            //         break;
+            // }
 
         }
         private void UpdateSelectedItemInfo()

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

@@ -424,19 +424,19 @@ namespace GFGGame
             PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
             UI_ListItem item = UI_ListItem.Proxy(obj);
 
-            // if (data.Ntexture == null)
-            // {
-            //     Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(data.PictureTempUrl, (Texture2D texture) =>
-            //     {
-            //         data.Ntexture = new NTexture(texture);
-            //         item.m_loaIcon.texture = data.Ntexture;
-            //     }));
-            // }
-            // else
-            // {
-            //     item.m_loaIcon.texture = data.Ntexture;
-            // }
-            // item.m_loaIcon.height = item.m_loaIcon.width * item.m_loaIcon.texture.height / item.m_loaIcon.texture.width;
+            if (data.Ntexture == null)
+            {
+                Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(data.PictureTempUrl, (Texture2D texture) =>
+                {
+                    data.Ntexture = new NTexture(texture);
+                    item.m_loaIcon.texture = data.Ntexture;
+                }));
+            }
+            else
+            {
+                item.m_loaIcon.texture = data.Ntexture;
+            }
+            item.m_loaIcon.height = item.m_loaIcon.width * item.m_loaIcon.texture.height / item.m_loaIcon.texture.width;
             item.m_txtName.text = data.AuthorName;
             item.m_btnCollect.title = data.CollectCount.ToString();
             item.m_btnCollect.selected = data.CollectOrNot;