浏览代码

商店资源名称整理

zhaoyang 2 年之前
父节点
当前提交
7328a8c07c
共有 33 个文件被更改,包括 283 次插入129 次删除
  1. 78 0
      FGUIProject/assets/ClothingShop/ArenaShopUI.xml
  2. 4 4
      FGUIProject/assets/ClothingShop/ClothingShopUI.xml
  3. 0 0
      FGUIProject/assets/ClothingShop/components/ComClothingRole.xml
  4. 0 0
      FGUIProject/assets/ClothingShop/components/ComClothingRoleModel.xml
  5. 0 0
      FGUIProject/assets/ClothingShop/components/ComClothingShopItemInfo.xml
  6. 0 0
      FGUIProject/assets/ClothingShop/components/ComGalleryShopBottom.xml
  7. 0 0
      FGUIProject/assets/ClothingShop/components/ComGalleryShopTab.xml
  8. 0 10
      FGUIProject/assets/ClothingShop/components/ComItem.xml
  9. 0 24
      FGUIProject/assets/ClothingShop/components/ComRes.xml
  10. 0 0
      FGUIProject/assets/ClothingShop/components/ListClothingShopItem.xml
  11. 7 8
      FGUIProject/assets/ClothingShop/package.xml
  12. 100 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ArenaShopUI.cs
  13. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ArenaShopUI.cs.meta
  14. 4 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ClothingShopUI.cs
  15. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingRole.cs
  16. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingRole.cs.meta
  17. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingRoleModel.cs
  18. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingRoleModel.cs.meta
  19. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingShopItemInfo.cs
  20. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingShopItemInfo.cs.meta
  21. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComGalleryShopBottom.cs
  22. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComGalleryShopBottom.cs.meta
  23. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComGalleryShopTab.cs
  24. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComGalleryShopTab.cs.meta
  25. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_Component3.cs.meta
  26. 2 2
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_GalleryShopUI.cs
  27. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ListClothingShopItem.cs
  28. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ListClothingShopItem.cs.meta
  29. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ShopListItemRender.cs.meta
  30. 5 5
      GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs
  31. 二进制
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png
  32. 二进制
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png
  33. 二进制
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes

+ 78 - 0
FGUIProject/assets/ClothingShop/ArenaShopUI.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n63_gbqo" 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>
+    <component id="n3_hinb" name="compHolder" src="ugdz1g" fileName="components/ComClothingRole.xml" xy="0,250">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <component id="n7_hinb" name="compItemInfo" src="hinb1d" fileName="components/ComClothingShopItemInfo.xml" xy="618,217">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <loader id="n45_ugdz" name="n45" xy="0,0" size="1080,199" url="ui://e5hnfx8augdz1i" fill="scaleFree"/>
+    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6"/>
+    <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <image id="n49_f5bl" name="n49" src="lwri5x" fileName="images/hc_btkuang_1.png" pkg="eg2y0ldp" xy="282,103" group="n51_f5bl"/>
+    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="152,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="活动商店"/>
+    <group id="n51_f5bl" name="grpTop" xy="282,103" size="516,55" visible="false" advanced="true"/>
+    <image id="n9_hinb" name="bgList" src="hinbx" fileName="images/fzd_diban_2.png" xy="0,1176" group="n65_v95q">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <list id="n44_hinb" name="listType" xy="0,1165" size="1080,116" group="n65_v95q" layout="row" overflow="scroll" scroll="horizontal" scrollItemToViewOnClick="false">
+      <relation target="n9_hinb" sidePair="top-top"/>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinba"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbm"/>
+      </item>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinbb"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbn"/>
+      </item>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinbc"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbo"/>
+      </item>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinbd"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbp"/>
+      </item>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinbe"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbq"/>
+      </item>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinbf"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbr"/>
+      </item>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinbg"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbs"/>
+      </item>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinbh"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbt"/>
+      </item>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinbi"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbu"/>
+      </item>
+      <item url="ui://e5hnfx8arlej5y">
+        <property target="icon" propertyId="1" value="ui://e5hnfx8ahinbj"/>
+        <property target="icon1" propertyId="1" value="ui://e5hnfx8ahinbv"/>
+      </item>
+    </list>
+    <list id="n43_hinb" name="listShop" xy="30,1314" size="1032,606" group="n65_v95q" layout="flow_hz" overflow="scroll" lineGap="31" colGap="10" defaultItem="ui://e5hnfx8ahinb1c" autoClearItems="true">
+      <relation target="n9_hinb" sidePair="top-top,bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n65_v95q" name="n65" xy="0,1165" size="1080,755"/>
+  </displayList>
+</component>

+ 4 - 4
FGUIProject/assets/ClothingShop/ClothingShopUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,3,,4,,5,,6," selected="0">
+  <controller name="c1" pages="2,,3,,4,,5,,6," selected="4">
     <remark page="1" value="服装店"/>
     <remark page="2" value="落星商店"/>
     <remark page="3" value="活动商店"/>
@@ -17,12 +17,12 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <loader id="n45_ugdz" name="n45" xy="0,0" size="1080,199" url="ui://e5hnfx8augdz1i" fill="scaleFree"/>
-    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6">
-      <gearXY controller="c1" pages="2,3,4,5,6" values="0,95|0,90|0,105|0,105|0,105"/>
+    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,105" controller="c1,6">
+      <gearXY controller="c1" pages="2,3,4,5,6" values="0,95|0,105|0,105|0,105|0,105"/>
     </component>
     <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n49_f5bl" name="n49" src="lwri5x" fileName="images/hc_btkuang_1.png" pkg="eg2y0ldp" xy="282,103" group="n51_f5bl"/>
-    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="152,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="活动商店">
+    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="152,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="画廊商店">
       <gearText controller="c1" pages="4,6" values="落星商店|画廊商店" default="活动商店"/>
     </text>
     <group id="n51_f5bl" name="grpTop" xy="282,103" size="516,55" visible="false" advanced="true">

+ 0 - 0
FGUIProject/assets/ClothingShop/components/Component1.xml → FGUIProject/assets/ClothingShop/components/ComClothingRole.xml


+ 0 - 0
FGUIProject/assets/ClothingShop/components/Component2.xml → FGUIProject/assets/ClothingShop/components/ComClothingRoleModel.xml


+ 0 - 0
FGUIProject/assets/ClothingShop/components/CompItemInfo.xml → FGUIProject/assets/ClothingShop/components/ComClothingShopItemInfo.xml


+ 0 - 0
FGUIProject/assets/ClothingShop/components/ComItemList.xml → FGUIProject/assets/ClothingShop/components/ComGalleryShopBottom.xml


+ 0 - 0
FGUIProject/assets/ClothingShop/components/Component3.xml → FGUIProject/assets/ClothingShop/components/ComGalleryShopTab.xml


+ 0 - 10
FGUIProject/assets/ClothingShop/components/ComItem.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1000,1000" opaque="false">
-  <displayList>
-    <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>

+ 0 - 24
FGUIProject/assets/ClothingShop/components/ComRes.xml

@@ -1,24 +0,0 @@
-<?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="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="80,460" pivot="0.5,0.5" size="1000,1000" aspect="true" url="ui://mbo439wbih753e" fill="scale">
-      <gearDisplay controller="c1" pages="1"/>
-    </loader>
-    <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"/>
-    </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>
-</component>

+ 0 - 0
FGUIProject/assets/ClothingShop/components/ShopListItemRender.xml → FGUIProject/assets/ClothingShop/components/ListClothingShopItem.xml


+ 7 - 8
FGUIProject/assets/ClothingShop/package.xml

@@ -30,11 +30,11 @@
     <image id="hinbx" name="fzd_diban_2.png" path="/images/" scale="9grid" scale9grid="18,215,999,379"/>
     <image id="hinb19" name="fzd_diban_4.png" path="/images/"/>
     <image id="hinb1b" name="fzd_yyy.png" path="/images/"/>
-    <component id="hinb1c" name="ShopListItemRender.xml" path="/components/"/>
-    <component id="hinb1d" name="CompItemInfo.xml" path="/components/" exported="true"/>
+    <component id="hinb1c" name="ListClothingShopItem.xml" path="/components/"/>
+    <component id="hinb1d" name="ComClothingShopItemInfo.xml" path="/components/" exported="true"/>
     <image id="ugdz1e" name="fzd_diban_5.png" path="/images/" scale="9grid" scale9grid="18,13,14,26"/>
-    <component id="ugdz1g" name="Component1.xml" path="/components/"/>
-    <component id="ugdz1h" name="Component2.xml" path="/components/"/>
+    <component id="ugdz1g" name="ComClothingRole.xml" path="/components/"/>
+    <component id="ugdz1h" name="ComClothingRoleModel.xml" path="/components/"/>
     <image id="ugdz1i" name="fzd_diban_6.png" path="/images/"/>
     <image id="f5bl5x" name="fzd_fzxzhong.png" path="/images/" exported="true"/>
     <component id="rlej5y" name="ButtonModle.xml" path="/components/"/>
@@ -44,12 +44,11 @@
     <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/"/>
+    <component id="r9ri65" name="ComGalleryShopBottom.xml" path="/components/"/>
     <image id="r9ri66" name="pz_dktu_1.png" path="/images/" scale="9grid" scale9grid="270,190,540,380"/>
-    <component id="r9ri67" name="Component3.xml" path="/components/"/>
+    <component id="r9ri67" name="ComGalleryShopTab.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/"/>
@@ -68,10 +67,10 @@
     <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/"/>
     <image id="r9ri6u" name="jfsc_yyy.png" path="/images/"/>
     <image id="v95qek" name="fzd_kuangdidi.png" path="/images/"/>
     <image id="v95qel" name="fzd_xiant_2.png" path="/images/"/>
+    <component id="psphem" name="ArenaShopUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 100 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ArenaShopUI.cs

@@ -0,0 +1,100 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingShop
+{
+    public partial class UI_ArenaShopUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public UI_ComClothingRole m_compHolder;
+        public UI_ComClothingShopItemInfo m_compItemInfo;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public GTextField m_txtTitle;
+        public GGroup m_grpTop;
+        public GImage m_bgList;
+        public GList m_listType;
+        public GList m_listShop;
+        public const string URL = "ui://e5hnfx8apsphem";
+        public const string PACKAGE_NAME = "ClothingShop";
+        public const string RES_NAME = "ArenaShopUI";
+        private static UI_ArenaShopUI _proxy;
+
+        public static UI_ArenaShopUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ArenaShopUI();
+            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_ArenaShopUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ArenaShopUI();
+            }
+            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_compHolder = (UI_ComClothingRole)UI_ComClothingRole.Create(comp.GetChild("compHolder"));
+            m_compItemInfo = (UI_ComClothingShopItemInfo)UI_ComClothingShopItemInfo.Create(comp.GetChild("compItemInfo"));
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_grpTop = (GGroup)comp.GetChild("grpTop");
+            m_bgList = (GImage)comp.GetChild("bgList");
+            m_listType = (GList)comp.GetChild("listType");
+            m_listShop = (GList)comp.GetChild("listShop");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_compHolder.Dispose();
+            m_compHolder = null;
+            m_compItemInfo.Dispose();
+            m_compItemInfo = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            m_txtTitle = null;
+            m_grpTop = null;
+            m_bgList = null;
+            m_listType = null;
+            m_listShop = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComItemList.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ArenaShopUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: de537f927e79bdc45a696419f4d3ebe4
+guid: c2f83a8bd973e0a44823c1dbfa5f17d5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 4 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ClothingShopUI.cs

@@ -9,8 +9,8 @@ namespace UI.ClothingShop
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
-        public UI_Component1 m_compHolder;
-        public UI_CompItemInfo m_compItemInfo;
+        public UI_ComClothingRole m_compHolder;
+        public UI_ComClothingShopItemInfo m_compItemInfo;
         public GComponent m_valueBar;
         public GButton m_btnBack;
         public GTextField m_txtTitle;
@@ -72,8 +72,8 @@ namespace UI.ClothingShop
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_compHolder = (UI_Component1)UI_Component1.Create(comp.GetChild("compHolder"));
-            m_compItemInfo = (UI_CompItemInfo)UI_CompItemInfo.Create(comp.GetChild("compItemInfo"));
+            m_compHolder = (UI_ComClothingRole)UI_ComClothingRole.Create(comp.GetChild("compHolder"));
+            m_compItemInfo = (UI_ComClothingShopItemInfo)UI_ComClothingShopItemInfo.Create(comp.GetChild("compItemInfo"));
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_Component1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingRole.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.ClothingShop
 {
-    public partial class UI_Component1
+    public partial class UI_ComClothingRole
     {
         public GComponent target;
-        public UI_Component2 m_compMover;
+        public UI_ComClothingRoleModel m_compMover;
         public const string URL = "ui://e5hnfx8augdz1g";
         public const string PACKAGE_NAME = "ClothingShop";
-        public const string RES_NAME = "Component1";
-        private static UI_Component1 _proxy;
+        public const string RES_NAME = "ComClothingRole";
+        private static UI_ComClothingRole _proxy;
 
-        public static UI_Component1 Create(GObject gObject = null)
+        public static UI_ComClothingRole Create(GObject gObject = null)
         {
-            var ui = new UI_Component1();
+            var ui = new UI_ComClothingRole();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.ClothingShop
             return ui;
         }
 
-        public static UI_Component1 Proxy(GObject gObject = null)
+        public static UI_ComClothingRole Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Component1();
+                _proxy = new UI_ComClothingRole();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,7 +55,7 @@ namespace UI.ClothingShop
 
         private void Init(GComponent comp)
         {
-            m_compMover = (UI_Component2)UI_Component2.Create(comp.GetChild("compMover"));
+            m_compMover = (UI_ComClothingRoleModel)UI_ComClothingRoleModel.Create(comp.GetChild("compMover"));
         }
         public void Dispose(bool disposeTarget = false)
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_CompItemInfo.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingRole.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 282bbc6e7b950f74ca3b2284172dd37d
+guid: ce048be16ffd96340aa792e28af89941
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_Component2.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingRoleModel.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.ClothingShop
 {
-    public partial class UI_Component2
+    public partial class UI_ComClothingRoleModel
     {
         public GComponent target;
         public GGraph m_holder;
         public const string URL = "ui://e5hnfx8augdz1h";
         public const string PACKAGE_NAME = "ClothingShop";
-        public const string RES_NAME = "Component2";
-        private static UI_Component2 _proxy;
+        public const string RES_NAME = "ComClothingRoleModel";
+        private static UI_ComClothingRoleModel _proxy;
 
-        public static UI_Component2 Create(GObject gObject = null)
+        public static UI_ComClothingRoleModel Create(GObject gObject = null)
         {
-            var ui = new UI_Component2();
+            var ui = new UI_ComClothingRoleModel();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.ClothingShop
             return ui;
         }
 
-        public static UI_Component2 Proxy(GObject gObject = null)
+        public static UI_ComClothingRoleModel Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Component2();
+                _proxy = new UI_ComClothingRoleModel();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_Component1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingRoleModel.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2f30ca5e04aaff44f8f85b8f5bdfb8ef
+guid: 6c93f166b39817e49812863ae2a1c14e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_CompItemInfo.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingShopItemInfo.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingShop
 {
-    public partial class UI_CompItemInfo
+    public partial class UI_ComClothingShopItemInfo
     {
         public GComponent target;
         public Controller m_c1;
@@ -23,12 +23,12 @@ namespace UI.ClothingShop
         public GTextField m_txtZhi;
         public const string URL = "ui://e5hnfx8ahinb1d";
         public const string PACKAGE_NAME = "ClothingShop";
-        public const string RES_NAME = "CompItemInfo";
-        private static UI_CompItemInfo _proxy;
+        public const string RES_NAME = "ComClothingShopItemInfo";
+        private static UI_ComClothingShopItemInfo _proxy;
 
-        public static UI_CompItemInfo Create(GObject gObject = null)
+        public static UI_ComClothingShopItemInfo Create(GObject gObject = null)
         {
-            var ui = new UI_CompItemInfo();
+            var ui = new UI_ComClothingShopItemInfo();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -37,11 +37,11 @@ namespace UI.ClothingShop
             return ui;
         }
 
-        public static UI_CompItemInfo Proxy(GObject gObject = null)
+        public static UI_ComClothingShopItemInfo Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_CompItemInfo();
+                _proxy = new UI_ComClothingShopItemInfo();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_Component2.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComClothingShopItemInfo.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a7c7032aa8490f741a467925e1779fa3
+guid: c469da0e3cf885342bfc1b2c4d39afeb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComItemList.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComGalleryShopBottom.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.ClothingShop
 {
-    public partial class UI_ComItemList
+    public partial class UI_ComGalleryShopBottom
     {
         public GComponent target;
         public Controller m_c1;
-        public UI_Component3 m_comBtnTab;
+        public UI_ComGalleryShopTab 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 const string RES_NAME = "ComGalleryShopBottom";
+        private static UI_ComGalleryShopBottom _proxy;
 
-        public static UI_ComItemList Create(GObject gObject = null)
+        public static UI_ComGalleryShopBottom Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemList();
+            var ui = new UI_ComGalleryShopBottom();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.ClothingShop
             return ui;
         }
 
-        public static UI_ComItemList Proxy(GObject gObject = null)
+        public static UI_ComGalleryShopBottom Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemList();
+                _proxy = new UI_ComGalleryShopBottom();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -58,7 +58,7 @@ namespace UI.ClothingShop
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_comBtnTab = (UI_Component3)UI_Component3.Create(comp.GetChild("comBtnTab"));
+            m_comBtnTab = (UI_ComGalleryShopTab)UI_ComGalleryShopTab.Create(comp.GetChild("comBtnTab"));
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComGalleryShopBottom.cs.meta

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

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_Component3.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComGalleryShopTab.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingShop
 {
-    public partial class UI_Component3
+    public partial class UI_ComGalleryShopTab
     {
         public GComponent target;
         public Controller m_c1;
@@ -15,12 +15,12 @@ namespace UI.ClothingShop
         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 const string RES_NAME = "ComGalleryShopTab";
+        private static UI_ComGalleryShopTab _proxy;
 
-        public static UI_Component3 Create(GObject gObject = null)
+        public static UI_ComGalleryShopTab Create(GObject gObject = null)
         {
-            var ui = new UI_Component3();
+            var ui = new UI_ComGalleryShopTab();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -29,11 +29,11 @@ namespace UI.ClothingShop
             return ui;
         }
 
-        public static UI_Component3 Proxy(GObject gObject = null)
+        public static UI_ComGalleryShopTab Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Component3();
+                _proxy = new UI_ComGalleryShopTab();
             }
             var ui = _proxy;
             if(gObject == null)

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ComGalleryShopTab.cs.meta

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_Component3.cs.meta

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

+ 2 - 2
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_GalleryShopUI.cs

@@ -14,7 +14,7 @@ namespace UI.ClothingShop
         public GTextField m_txtName;
         public GTextField m_txtDesc;
         public GLoader m_loaIcon;
-        public UI_ComItemList m_comItemList;
+        public UI_ComGalleryShopBottom m_comItemList;
         public const string URL = "ui://e5hnfx8ar9riee";
         public const string PACKAGE_NAME = "ClothingShop";
         public const string RES_NAME = "GalleryShopUI";
@@ -69,7 +69,7 @@ namespace UI.ClothingShop
             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"));
+            m_comItemList = (UI_ComGalleryShopBottom)UI_ComGalleryShopBottom.Create(comp.GetChild("comItemList"));
         }
         public void Dispose(bool disposeTarget = false)
         {

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ShopListItemRender.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ListClothingShopItem.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingShop
 {
-    public partial class UI_ShopListItemRender
+    public partial class UI_ListClothingShopItem
     {
         public GComponent target;
         public Controller m_c1;
@@ -17,12 +17,12 @@ namespace UI.ClothingShop
         public GTextField m_txtPrice;
         public const string URL = "ui://e5hnfx8ahinb1c";
         public const string PACKAGE_NAME = "ClothingShop";
-        public const string RES_NAME = "ShopListItemRender";
-        private static UI_ShopListItemRender _proxy;
+        public const string RES_NAME = "ListClothingShopItem";
+        private static UI_ListClothingShopItem _proxy;
 
-        public static UI_ShopListItemRender Create(GObject gObject = null)
+        public static UI_ListClothingShopItem Create(GObject gObject = null)
         {
-            var ui = new UI_ShopListItemRender();
+            var ui = new UI_ListClothingShopItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -31,11 +31,11 @@ namespace UI.ClothingShop
             return ui;
         }
 
-        public static UI_ShopListItemRender Proxy(GObject gObject = null)
+        public static UI_ListClothingShopItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ShopListItemRender();
+                _proxy = new UI_ListClothingShopItem();
             }
             var ui = _proxy;
             if(gObject == null)

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ListClothingShopItem.cs.meta

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingShop/UI_ShopListItemRender.cs.meta

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

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -262,7 +262,7 @@ namespace GFGGame
             _sceneObject = GameObject.Instantiate(_scenePrefab);
             int scale = 70;
             _sceneObject.transform.localScale = new Vector3(scale, scale, scale);
-            _dressUpObj.setSceneObj(_sceneObject,false, true, null, false);
+            _dressUpObj.setSceneObj(_sceneObject, false, true, null, false);
             _dressUpObj.PutOnDefaultDressUpData();
             _dressUpObj.AddOrRemove(_cfgSelected.itemID, true);
             if (_wrapper == null)
@@ -345,7 +345,7 @@ namespace GFGGame
 
         private void ListShopItemRender(int index, GObject item)
         {
-            UI_ShopListItemRender listItem = UI_ShopListItemRender.Proxy(item);
+            UI_ListClothingShopItem listItem = UI_ListClothingShopItem.Proxy(item);
             ShopCfg cfg = _dataList[index];
             listItem.target.data = cfg;
             // listItem.m_grpSelect.visible = false;
@@ -360,7 +360,7 @@ namespace GFGGame
             listItem.m_txtPrice.text = ItemDataManager.GetItemNum(cfg.costID) >= cfg.costNum ? StringUtil.GetColorText(cfg.costNum.ToString(), "#DD994A") : StringUtil.GetColorText(cfg.costNum.ToString(), "#F2989B");
             listItem.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (itemCfg.mainScore));
 
-            UI_ShopListItemRender.ProxyEnd();
+            UI_ListClothingShopItem.ProxyEnd();
         }
 
         private void UpdateSelectedItemInfo(GComponent listItem, bool tween)
@@ -392,9 +392,9 @@ namespace GFGGame
             _ui.m_compItemInfo.m_txtJue.text = "" + itemCfg.score3;
             _ui.m_compItemInfo.m_txtZhi.text = "" + itemCfg.score4;
             _ui.m_compItemInfo.m_txtOwned.SetVar("v1", "" + ItemDataManager.GetItemNum(_cfgSelected.itemID)).FlushVars();
-            UI_ShopListItemRender listItem = UI_ShopListItemRender.Proxy(_selectedListItem);
+            UI_ListClothingShopItem listItem = UI_ListClothingShopItem.Proxy(_selectedListItem);
             listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(_cfgSelected.itemID) > 0;
-            UI_ShopListItemRender.ProxyEnd();
+            UI_ListClothingShopItem.ProxyEnd();
             _ui.m_compItemInfo.m_listTag.numItems = itemCfg.tagsArr.Length;
         }
 

二进制
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png


二进制
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes