画廊商店

FGUIProject/assets/ClothingShop/GalleryShopUI.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" overflow="hidden" scroll="both">
+  <displayList>
+    <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">
+      <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">
+      <relation target="n19_r9ri" sidePair="bottom-bottom"/>
+    </group>
+    <component id="n5_7dea" name="comItemList" src="r9ri65" fileName="components/ComItemList.xml" xy="0,1162">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/ClothingShop/components/Button7.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="308,105" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n6_r9ri" name="n6" src="r9ri69" fileName="images/pz_xiantiao.png" xy="306,17" group="n7_r9ri"/>
+    <image id="n5_ih75" name="n5" src="r9ri6a" fileName="images/pz_xzzikuang.png" xy="-3,0" group="n7_r9ri">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <loader id="n2_ih75" name="icon" xy="111,40" size="86,44" group="n7_r9ri" url="ui://e5hnfx8ar9ri6b" autoSize="true"/>
+    <text id="n1_ih75" name="title" xy="-3,0" size="308,105" group="n7_r9ri" fontSize="42" color="#fff7eb" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <group id="n7_r9ri" name="n7" xy="-3,0" size="314,105"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/ClothingShop/components/ComItem.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="142,142" 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"/>
+  </displayList>
+  <relation target="n32_r9ri" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/ClothingShop/components/ComItemList.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,758">
+  <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
+  <displayList>
+    <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">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/ClothingShop/components/ComRes.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+      <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">
+      <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">
+      <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">
+      <gearDisplay controller="c1" pages="3"/>
+    </loader>
+  </displayList>
+</component>

FGUIProject/assets/ClothingShop/components/Component3.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,105" overflow="scroll" scroll="horizontal">
+  <controller name="c1" pages="1,,2,,3,,4,,5," selected="0"/>
+  <displayList>
+    <component id="n9_7dea" name="btn0" src="r9ri68" fileName="components/Button7.xml" xy="-8,0" group="n14_7dea">
+      <Button checked="true" icon="ui://e5hnfx8ar9ri6c" selectedIcon="ui://e5hnfx8ar9ri6b" controller="c1" page="1"/>
+    </component>
+    <component id="n10_7dea" name="btn1" src="r9ri68" fileName="components/Button7.xml" xy="300,0" group="n14_7dea">
+      <Button icon="ui://e5hnfx8ar9ri6d" selectedIcon="ui://e5hnfx8ar9ri6e" controller="c1" page="2"/>
+    </component>
+    <component id="n11_7dea" name="btn2" src="r9ri68" fileName="components/Button7.xml" xy="608,0" group="n14_7dea">
+      <Button icon="ui://e5hnfx8ar9ri6f" selectedIcon="ui://e5hnfx8ar9ri6g" controller="c1" page="3"/>
+    </component>
+    <component id="n12_7dea" name="btn3" src="r9ri68" fileName="components/Button7.xml" xy="916,0" group="n14_7dea">
+      <Button icon="ui://e5hnfx8ar9ri6h" selectedIcon="ui://e5hnfx8ar9ri6i" controller="c1" page="4"/>
+    </component>
+    <component id="n13_7dea" name="btn4" src="r9ri68" fileName="components/Button7.xml" xy="1224,0" group="n14_7dea">
+      <Button icon="ui://e5hnfx8ar9ri6j" selectedIcon="ui://e5hnfx8ar9ri6k" controller="c1" page="5"/>
+    </component>
+    <group id="n14_7dea" name="n14" xy="-8,0" size="1540,105" advanced="true" layout="hz" excludeInvisibles="true"/>
+  </displayList>
+</component>

FGUIProject/assets/ClothingShop/components/ListGalleryShopItem.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,290" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n4_xmtl" name="n4" src="r9ri6m" fileName="images/pz_dituhua.png" xy="14,14" group="n8_r9ri"/>
+    <image id="n5_xmtl" name="n5" src="r9ri6n" fileName="images/pz_xzkuang.png" xy="0,0" group="n8_r9ri">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <loader id="n3_xmtl" name="loaIcon" xy="55,45" size="139,139" group="n8_r9ri" aspect="true" url="ui://mbo439wb7dea4d" fill="scaleFree"/>
+    <text id="n6_xmtl" name="txtName" xy="125,186" pivot="0.5,0" anchor="true" size="172,39" group="n8_r9ri" fontSize="28" color="#9d804e" text="沧海月明·月">
+      <gearColor controller="button" pages="0" values="#9d804e,#737f6e" default="#d49692,#737f6e"/>
+    </text>
+    <group id="n8_r9ri" name="n8" xy="0,0" size="250,250"/>
+    <loader id="n9_r9ri" name="iconPrice" xy="69,251" size="32,32" group="n11_r9ri" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n10_r9ri" name="txtPrice" xy="112,242" size="69,46" group="n11_r9ri" fontSize="34" color="#9d804e" ubb="true" bold="true" autoClearText="true" text="999"/>
+    <group id="n11_r9ri" name="n11" xy="69,242" size="112,46" advanced="true" layout="hz" colGap="11">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <image id="n12_r9ri" name="imgOwned" src="hinb1b" fileName="images/fzd_yyy.png" xy="53,153"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/ClothingShop/package.xml

@@ -44,6 +44,32 @@
     <movieclip id="lj7e62" name="MovieClip2.jta" path="/effect/"/>
     <image id="lj7e63" name="hd.png" path="/images/"/>
     <component id="jpnf64" name="ComSelect.xml" path="/components/" exported="true"/>
+    <component id="r9riee" name="GalleryShopUI.xml" path="/" exported="true"/>
+    <component id="r9riej" name="ComRes.xml" path="/components/"/>
+    <image id="r9rieg" name="hl_jfscibt.png" path="/images/"/>
+    <image id="r9rieh" name="jfsc_dik.png" path="/images/" scale="9grid" scale9grid="113,105,226,103"/>
+    <component id="r9ri65" name="ComItemList.xml" path="/components/"/>
+    <image id="r9ri66" name="pz_dktu_1.png" path="/images/"/>
+    <component id="r9ri67" name="Component3.xml" path="/components/"/>
+    <component id="r9ri68" name="Button7.xml" path="/components/"/>
+    <image id="r9ri69" name="pz_xiantiao.png" path="/images/"/>
+    <image id="r9ri6a" name="pz_xzzikuang.png" path="/images/"/>
+    <image id="r9ri6b" name="pz_xzzi_1.png" path="/images/"/>
+    <image id="r9ri6c" name="pz_zi_1.png" path="/images/"/>
+    <image id="r9ri6d" name="pz_zi_2.png" path="/images/"/>
+    <image id="r9ri6e" name="pz_xzzi_2.png" path="/images/"/>
+    <image id="r9ri6f" name="pz_zi_3.png" path="/images/"/>
+    <image id="r9ri6g" name="pz_xzzi_3.png" path="/images/"/>
+    <image id="r9ri6h" name="pz_zi_4.png" path="/images/"/>
+    <image id="r9ri6i" name="pz_xzzi_4.png" path="/images/"/>
+    <image id="r9ri6j" name="pz_zi_5.png" path="/images/"/>
+    <image id="r9ri6k" name="pz_xzzi_5.png" path="/images/"/>
+    <image id="r9ri6m" name="pz_dituhua.png" path="/images/"/>
+    <image id="r9ri6n" name="pz_xzkuang.png" path="/images/"/>
+    <image id="r9ri6o" name="dj_danxiaozj.png" path="/images/" atlas="alone_npot"/>
+    <component id="r9rief" name="ListGalleryShopItem.xml" path="/components/"/>
+    <image id="r9ri6r" name="jfsc_xiantiao_1.png" path="/images/"/>
+    <component id="r9ri6s" name="ComItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/components/Button19.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="284,81" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="284,81" url="ui://eg2y0ldpr9ritjr" autoSize="true"/>
+    <text id="n1_r9ri" name="title" xy="0,-2" size="284,81" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#d89291" strokeSize="2" singleLine="true" text="挑战十次">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n2_r9ri" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -218,6 +218,8 @@
     <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
     <image id="r9ritjk" name="tc_tydikua_1.png" path="/imgnew/" scale="9grid" scale9grid="240,281,480,562"/>
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
+    <component id="r9ritjq" name="Button19.xml" path="/components/" exported="true"/>
+    <image id="r9ritjr" name="anniuty4.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/components/ComSelect.xml → FGUIProject/assets/DressUp/components/ComItemList.xml

@@ -4,7 +4,7 @@
   <displayList>
     <image id="n15_xmtl" name="n15" src="xmtl4z" fileName="images/pz_dktu_1.png" xy="0,0"/>
     <component id="n9_7dea" name="comBtnTab" src="xmtl56" fileName="components/Component2.xml" xy="0,-11"/>
-    <list id="n8_7dea" name="list" xy="17,114" size="1045,644" layout="flow_hz" overflow="scroll" colGap="15" defaultItem="ui://mbo439wbxmtl57">
+    <list id="n8_7dea" name="list" xy="17,114" size="1045,644" layout="flow_hz" overflow="scroll" lineGap="14" colGap="15" defaultItem="ui://mbo439wbxmtl57">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/DressUp/package.xml

@@ -92,7 +92,7 @@
     <component id="ih753n" name="Button5.xml" path="/components/"/>
     <component id="f4xv3o" name="Button6.xml" path="/components/"/>
     <image id="f4xv3p" name="hz_yijidi.png" path="/images/" scale="9grid" scale9grid="46,275,92,135"/>
-    <component id="f4xv3q" name="comListType.xml" path="/"/>
+    <component id="f4xv3q" name="comListType.xml" path="/components/"/>
     <component id="f4xv3s" name="ButtonDelete.xml" path="/components/"/>
     <component id="f4xv3t" name="ButtonLastStep.xml" path="/components/"/>
     <component id="f4xv3u" name="ButtonNextStep.xml" path="/components/"/>
@@ -113,11 +113,11 @@
     <image id="7dea4b" name="kp_dikuang_6.png" path="/images/" scale="9grid" scale9grid="43,41,33,37"/>
     <component id="7dea4c" name="Button7.xml" path="/components/"/>
     <image id="7dea4d" name="dj_danxiaozj.png" path="/images/" atlas="alone_npot"/>
-    <component id="7dea4f" name="ComSelect.xml" path="/components/"/>
+    <component id="7dea4f" name="ComItemList.xml" path="/components/"/>
     <image id="7dea4g" name="kp_kprk_4.png" path="/images/" scale="9grid" scale9grid="52,90,104,180"/>
     <component id="g3xa4h" name="Button8.xml" path="/components/"/>
     <component id="g3xa4i" name="Button9.xml" path="/components/"/>
-    <component id="g3xa4l" name="ComChecked.xml" path="/"/>
+    <component id="g3xa4l" name="ComChecked.xml" path="/components/"/>
     <image id="xmtl4m" name="pz_bjanniu_1.png" path="/images/"/>
     <image id="xmtl4n" name="pz_xzzi_3.png" path="/images/"/>
     <image id="xmtl4o" name="pz_xzzi_2.png" path="/images/"/>
@@ -174,13 +174,12 @@
     <image id="wonoe4" name="hz_zdikuang_1.png" path="/images/" scale="9grid" scale9grid="56,23,112,46"/>
     <component id="wonoe5" name="Button14.xml" path="/components/"/>
     <image id="wonoe6" name="hz_zdikuang_2.png" path="/images/"/>
-    <image id="r9rie7" name="pz_bkbk_1.png" path="/images/"/>
-    <image id="r9rie8" name="pz_bkicon_0.png" path="/images/"/>
     <image id="r9rie9" name="pz_zi_1.png" path="/images/"/>
     <image id="r9riea" name="pz_zi_2.png" path="/images/"/>
     <image id="r9rieb" name="pz_zi_3.png" path="/images/"/>
     <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/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -12,8 +12,8 @@ namespace GFGEditor
     {
         // private static string[] _shopItemType = new string[] { "推荐", "发型", "连衣裙", "内搭", "上衣", "下装", "外套", "袜子", "鞋子", "饰品" };
         private static string[] _shopItemType = new string[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-        //[背景，人物，道具，边框]
-        private static string[] _galleryShopItemType = new string[] { "0", "1", "2", "3" };
+        //[背景，人物，道具，边框,滤镜]
+        private static string[] _galleryShopItemType = new string[] { "0", "1", "2", "3", "4" };
 
         public static void StartScan()
         {
@@ -278,6 +278,10 @@ namespace GFGEditor
                         {
                             count = 3;//npc
                         }
+                        else if (itemCfg.subType == ConstItemSubType.EFFECT)
+                        {
+                            count = 4;//滤镜
+                        }
                     }
 
                     _typeIndexDic.Add(id, count.ToString());

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -398,7 +398,7 @@ namespace GFGGame
             return gameObj;
         }
 
-        private static void LoadSpritePos(string res, out float tx, out float ty)
+        public static void LoadSpritePos(string res, out float tx, out float ty)
         {
             string resPath = ResPathUtil.GetDressUpPath(res, "bytes");
             if (VEngine.Versions.Contains(resPath))

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

@@ -0,0 +1,80 @@
+/** 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/DressUp/UI_ComSelect.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 698ec0cb160602544bae4c10428b6158
+guid: da0584efe1da34f45845ad30c32c59ba
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingShop
+{
+    public partial class UI_ComItemList
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public UI_Component3 m_comBtnTab;
+        public GList m_list;
+        public const string URL = "ui://e5hnfx8ar9ri65";
+        public const string PACKAGE_NAME = "ClothingShop";
+        public const string RES_NAME = "ComItemList";
+        private static UI_ComItemList _proxy;
+
+        public static UI_ComItemList Create(GObject gObject = null)
+        {
+            var ui = new UI_ComItemList();
+            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_ComItemList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComItemList();
+            }
+            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_comBtnTab = (UI_Component3)UI_Component3.Create(comp.GetChild("comBtnTab"));
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_comBtnTab.Dispose();
+            m_comBtnTab = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,84 @@
+/** 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

@@ -0,0 +1,11 @@
+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_Component3.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingShop
+{
+    public partial class UI_Component3
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btn0;
+        public GButton m_btn1;
+        public GButton m_btn2;
+        public GButton m_btn3;
+        public GButton m_btn4;
+        public const string URL = "ui://e5hnfx8ar9ri67";
+        public const string PACKAGE_NAME = "ClothingShop";
+        public const string RES_NAME = "Component3";
+        private static UI_Component3 _proxy;
+
+        public static UI_Component3 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component3();
+            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_Component3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component3();
+            }
+            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_btn0 = (GButton)comp.GetChild("btn0");
+            m_btn1 = (GButton)comp.GetChild("btn1");
+            m_btn2 = (GButton)comp.GetChild("btn2");
+            m_btn3 = (GButton)comp.GetChild("btn3");
+            m_btn4 = (GButton)comp.GetChild("btn4");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btn0 = null;
+            m_btn1 = null;
+            m_btn2 = null;
+            m_btn3 = null;
+            m_btn4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,97 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingShop
+{
+    public partial class UI_GalleryShopUI
+    {
+        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 UI_ComItemList m_comItemList;
+        public const string URL = "ui://e5hnfx8ar9riee";
+        public const string PACKAGE_NAME = "ClothingShop";
+        public const string RES_NAME = "GalleryShopUI";
+        private static UI_GalleryShopUI _proxy;
+
+        public static UI_GalleryShopUI Create(GObject gObject = null)
+        {
+            var ui = new UI_GalleryShopUI();
+            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_GalleryShopUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_GalleryShopUI();
+            }
+            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_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_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_comItemList.Dispose();
+            m_comItemList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingShop
+{
+    public partial class UI_ListGalleryShopItem
+    {
+        public GButton target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtName;
+        public GLoader m_iconPrice;
+        public GTextField m_txtPrice;
+        public GImage m_imgOwned;
+        public const string URL = "ui://e5hnfx8ar9rief";
+        public const string PACKAGE_NAME = "ClothingShop";
+        public const string RES_NAME = "ListGalleryShopItem";
+        private static UI_ListGalleryShopItem _proxy;
+
+        public static UI_ListGalleryShopItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListGalleryShopItem();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListGalleryShopItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListGalleryShopItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_iconPrice = (GLoader)comp.GetChild("iconPrice");
+            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
+            m_imgOwned = (GImage)comp.GetChild("imgOwned");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtName = null;
+            m_iconPrice = null;
+            m_txtPrice = null;
+            m_imgOwned = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComSelect.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComItemList.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.DressUp
 {
-    public partial class UI_ComSelect
+    public partial class UI_ComItemList
     {
         public GComponent target;
         public Controller m_c1;
@@ -12,12 +12,12 @@ namespace UI.DressUp
         public GList m_list;
         public const string URL = "ui://mbo439wb7dea4f";
         public const string PACKAGE_NAME = "DressUp";
-        public const string RES_NAME = "ComSelect";
-        private static UI_ComSelect _proxy;
+        public const string RES_NAME = "ComItemList";
+        private static UI_ComItemList _proxy;
 
-        public static UI_ComSelect Create(GObject gObject = null)
+        public static UI_ComItemList Create(GObject gObject = null)
         {
-            var ui = new UI_ComSelect();
+            var ui = new UI_ComItemList();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.DressUp
             return ui;
         }
 
-        public static UI_ComSelect Proxy(GObject gObject = null)
+        public static UI_ComItemList Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComSelect();
+                _proxy = new UI_ComItemList();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComItemList.cs.meta

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

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

@@ -14,7 +14,7 @@ namespace UI.DressUp
         public UI_ComChecked m_comSelectBox;
         public GButton m_btnBack;
         public GButton m_btnGalleryJoin;
-        public UI_ComSelect m_ComSelectRes;
+        public UI_ComItemList m_ComSelectRes;
         public GButton m_btnPhotograph;
         public GButton m_btnChoose;
         public GButton m_btnUp;
@@ -73,7 +73,7 @@ namespace UI.DressUp
             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_ComSelect)UI_ComSelect.Create(comp.GetChild("ComSelectRes"));
+            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");

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

@@ -0,0 +1,358 @@
+using UI.ClothingShop;
+using UI.CommonGame;
+using FairyGUI;
+using UnityEngine;
+using System.Collections.Generic;
+using System;
+
+namespace GFGGame
+{
+    class GalleryShopTabType
+    {
+        public const int BG = 0;
+        public const int NPC = 1;
+        public const int ITEM = 2;
+        public const int BORDER = 3;
+        public const int EFFECT = 4;
+    }
+    public class GalleryShopView : BaseView
+    {
+
+        private UI_GalleryShopUI _ui;
+        private ValueBarController _valueBarController;
+        private List<ShopCfg> _dataList;
+        private ShopCfg _cfgSelected;
+        private const int MAX_COUNT = 99;
+        private const int INIT_COUNT = 1;
+        private int _scoreType;
+        private int _storeId = 1;
+        private GObject _selectedListItem;
+
+        private int _selectedItemId;//打开界面时选中的物品id
+        private int _selectedType = 0;//打开界面时选中的物品类型
+        private int _selectedItemCount;
+        private int _selectedItemClothingId;
+
+        public override void Dispose()
+        {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+
+
+            _cfgSelected = null;
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_GalleryShopUI.PACKAGE_NAME;
+            _ui = UI_GalleryShopUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+
+
+            _ui.m_comItemList.m_list.itemRenderer = ListShopItemRender;
+            _ui.m_comItemList.m_list.onClickItem.Add(OnClickListShopItem);
+            _ui.m_comItemList.m_comBtnTab.m_c1.onChanged.Add(OnClickListTypeItem);
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnBuy.onClick.Add(OnclickBtnBuy);
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hz_bjbj");
+
+
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateSelectedItemInfo);
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateItemChange);
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            _storeId = ConstStoreId.GALLERY_STORE_ID;
+            _scoreType = 0;
+            _selectedItemId = 0;
+            _selectedType = 0;
+            if (this.viewData != null)
+            {
+                //this.viewData[0]=storeId(商店Id)
+                //this.viewData[1]=_scoreType（服装属性：风花雪月）
+                //this.viewData[2]=_selectedItemId
+                //this.viewData[3]=_selectedItemCount
+                object[] objs = this.viewData as object[];
+                if (objs.Length > 0 && objs[0] != null)
+                {
+                    _storeId = (int)objs[0];//从抽奖跳转到商店会区分商店Id
+                }
+                if (objs.Length > 1 && objs[1] != null)
+                {
+                    _scoreType = (int)objs[1];//从战斗跳转到商店需要服装突出属性用来服装排序
+                }
+                if (objs.Length > 2 && objs[2] != null)
+                {
+                    _selectedItemId = (int)objs[2];//从物品来源面板跳转到商店，需要物品id方便打开界面时做选中处理
+                    _selectedItemCount = (int)objs[3];
+                    ShopCfg[] dataArray = ClothingShopCfgManager.Instance.GetShopCfgs(_storeId);
+                    for (int i = 0; i < dataArray.Length; i++)
+                    {
+                        if (dataArray[i].itemID == _selectedItemId)
+                        {
+                            _selectedType = dataArray[i].typeIndex;
+                            _selectedItemClothingId = dataArray[i].id;
+                            _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex = _selectedType;
+                            break;
+                        }
+                    }
+                }
+            }
+
+
+
+            _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex = _selectedType;
+            // _ui.m_listType.ScrollToView(_selectedType);
+            UpdateList(false);
+
+            _valueBarController.OnShown();
+
+            if (_selectedItemId > 0 && _selectedItemCount > 0)
+            {
+                ShopDataManager.Instance.BuyItem(_cfgSelected.id, _selectedItemCount, _storeId, _cfgSelected);
+            }
+
+            Timers.inst.AddUpdate(CheckGuide);
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _valueBarController.OnHide();
+
+            _selectedItemId = 0;
+            Timers.inst.Remove(CheckGuide);
+
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateSelectedItemInfo);
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateItemChange);
+
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(ViewName.CLOTHING_SHOP_VIEW);
+            this.Hide();
+
+        }
+
+        private void OnclickBtnBuy()
+        {
+            int count = _selectedItemId > 0 && _cfgSelected.itemID == _selectedItemId ? _selectedItemCount : INIT_COUNT;
+            // BuyItemConteoller.Show(_cfgSelected.itemID, _cfgSelected.costID, INIT_COUNT, _cfgSelected.costNum, count, null, true, false, MAX_COUNT);
+            count = Math.Max(1, count);
+            ShopDataManager.Instance.BuyItem(_cfgSelected.id, count, _storeId, _cfgSelected);
+        }
+        private void UpdateItemChange()
+        {
+            UpdateList(false);
+
+        }
+
+
+
+        private void UpdateList(bool tween)
+        {
+
+            int typeIndex = _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex;
+            _dataList = ClothingShopCfgManager.Instance.GetList(_storeId, typeIndex, _scoreType);
+            _ui.m_comItemList.m_list.numItems = _dataList.Count;
+
+
+            if (_ui.m_comItemList.m_list.numItems > 0)
+            {
+                ShopCfg clothingShopCfg = ClothingShopCfgManager.Instance.GetShopCfg(_selectedItemClothingId, _storeId);
+                int itemIndex = 0;
+                if (_selectedItemId > 0 && clothingShopCfg != null)
+                {
+                    for (int i = 0; i < _dataList.Count; i++)
+                    {
+                        if (_dataList[i].id == _selectedItemClothingId)
+                        {
+                            itemIndex = i;
+                            break;
+                        }
+                    }
+                    _ui.m_comItemList.m_list.ScrollToView(itemIndex < 0 ? 0 : itemIndex);
+                    _ui.m_comItemList.m_list.selectedIndex = itemIndex;
+                }
+                UpdateSelectedItemInfo(_ui.m_comItemList.m_list.GetChildAt(itemIndex) as GComponent, tween);
+            }
+        }
+
+
+
+        private void OnClickListTypeItem(EventContext context)
+        {
+            UpdateList(true);
+        }
+
+
+        private void ListShopItemRender(int index, GObject item)
+        {
+            UI_ListGalleryShopItem listItem = UI_ListGalleryShopItem.Proxy(item);
+            ShopCfg cfg = _dataList[index];
+            listItem.target.data = cfg;
+            // listItem.m_grpSelect.visible = false;
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemID);
+            listItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            string itemName = itemCfg.name;
+            listItem.m_txtName.text = itemName;
+            // RarityIconController.UpdateRarityIcon(listItem.m_rarity, cfg.itemID, false);
+            ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(cfg.costID);
+            listItem.m_iconPrice.url = "ui://CommonGame/" + costItemCfg.res;
+            listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(cfg.itemID) > 0;
+            // listItem.m_txtPrice.text = ItemDataManager.GetItemNum(cfg.costID) >= cfg.costNum ? StringUtil.GetColorText(cfg.costNum.ToString(), "#DD994A") : StringUtil.GetColorText(cfg.costNum.ToString(), "#F2989B");
+            listItem.m_txtPrice.text = cfg.costNum.ToString();
+            UI_ListGalleryShopItem.ProxyEnd();
+        }
+        private void OnClickListShopItem(EventContext context)
+        {
+            _selectedItemId = 0;
+
+            UpdateSelectedItemInfo(context.data as GComponent, true);
+        }
+
+        private void UpdateSelectedItemInfo(GComponent listItem, bool tween)
+        {
+            _selectedListItem = listItem;
+
+            ShopCfg cfg = listItem.data as ShopCfg;
+            _cfgSelected = cfg;
+            UpdateRole(tween);
+            UpdateSelectedItemInfo();
+        }
+        private void UpdateRole(bool tween)
+        {
+            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;
+            }
+
+        }
+        private void UpdateSelectedItemInfo()
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cfgSelected.itemID);
+            _ui.m_txtName.text = itemCfg.name;
+            _ui.m_txtDesc.text = itemCfg.desc;
+        }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.BUY_CLOTHING, 6, "回到换装。", -1, true, 140);
+        }
+
+
+
+    }
+}

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

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

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

@@ -184,7 +184,7 @@ namespace GFGGame
         private void OnBtnShopClick()
         {
             object[] gobackParamDatas = new object[] { _tabIndex, _subtabIndex, _ui.m_comNormal.m_comBoBox.selectedIndex };
-            ViewManager.Show<ClothingShopView>(new object[] { ConstStoreId.GALLERY_STORE_ID }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas }, true);
+            ViewManager.Show<GalleryShopView>(new object[] { ConstStoreId.GALLERY_STORE_ID }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas }, true);
         }
 
         /// <summary>