Browse Source

拍照替换资源

zhaoyang 2 years ago
parent
commit
3df1eaca01
40 changed files with 136 additions and 235 deletions
  1. 11 10
      FGUIProject/assets/DressUp/PhotographUI.xml
  2. 6 4
      FGUIProject/assets/DressUp/components/Button7.xml
  3. 3 4
      FGUIProject/assets/DressUp/components/ComSelect.xml
  4. 12 12
      FGUIProject/assets/DressUp/components/Component2.xml
  5. 8 6
      FGUIProject/assets/DressUp/components/ListItem.xml
  6. BIN
      FGUIProject/assets/DressUp/images/pz_bjanniu_1.png
  7. BIN
      FGUIProject/assets/DressUp/images/pz_bjanniu_2.png
  8. BIN
      FGUIProject/assets/DressUp/images/pz_bjanniu_3.png
  9. BIN
      FGUIProject/assets/DressUp/images/pz_bjkuang.png
  10. BIN
      FGUIProject/assets/DressUp/images/pz_dituhua.png
  11. BIN
      FGUIProject/assets/DressUp/images/pz_dktu_1.png
  12. BIN
      FGUIProject/assets/DressUp/images/pz_pzanniu.png
  13. BIN
      FGUIProject/assets/DressUp/images/pz_sxsx_1.png
  14. BIN
      FGUIProject/assets/DressUp/images/pz_sxsx_2.png
  15. BIN
      FGUIProject/assets/DressUp/images/pz_xiantiao.png
  16. BIN
      FGUIProject/assets/DressUp/images/pz_xzanniu.png
  17. BIN
      FGUIProject/assets/DressUp/images/pz_xzkuang.png
  18. BIN
      FGUIProject/assets/DressUp/images/pz_xzzi_1.png
  19. BIN
      FGUIProject/assets/DressUp/images/pz_xzzi_2.png
  20. BIN
      FGUIProject/assets/DressUp/images/pz_xzzi_3.png
  21. BIN
      FGUIProject/assets/DressUp/images/pz_xzzi_4.png
  22. BIN
      FGUIProject/assets/DressUp/images/pz_xzzi_5.png
  23. BIN
      FGUIProject/assets/DressUp/images/pz_xzzikuang.png
  24. BIN
      FGUIProject/assets/DressUp/images/pz_zi_1.png
  25. BIN
      FGUIProject/assets/DressUp/images/pz_zi_2.png
  26. BIN
      FGUIProject/assets/DressUp/images/pz_zi_3.png
  27. BIN
      FGUIProject/assets/DressUp/images/pz_zi_4.png
  28. BIN
      FGUIProject/assets/DressUp/images/pz_zi_5.png
  29. 7 0
      FGUIProject/assets/DressUp/package.xml
  30. 83 1
      GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs
  31. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComSelect.cs
  32. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographUI.cs
  33. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  34. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png
  35. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png
  36. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png
  37. 0 96
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png.meta
  38. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png
  39. 0 96
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png.meta
  40. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes

+ 11 - 10
FGUIProject/assets/DressUp/PhotographUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" scroll="both">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n8_g3xa" name="btnBg" xy="0,0" size="1080,1136">
       <relation target="" sidePair="height-height"/>
@@ -13,27 +13,28 @@
     </loader>
     <component id="n9_g3xa" name="comSelectBox" src="g3xa4l" fileName="ComChecked.xml" xy="420,728" pivot="0.5,0.5" anchor="true"/>
     <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n5_7dea" name="ComSelectRes" src="7dea4f" fileName="components/ComSelect.xml" xy="0,1086">
-      <relation target="" sidePair="center-center,bottom-bottom"/>
-    </component>
-    <component id="n18_r9ri" name="btnGalleryJoin" src="g3xa4h" fileName="components/Button8.xml" xy="940,409" group="n16_9ico">
+    <component id="n18_r9ri" name="btnGalleryJoin" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="369,1770" size="342,96">
       <gearDisplay controller="c1" pages="1"/>
-      <Button icon="ui://mbo439wbnz0t5d"/>
+      <relation target="" sidePair="bottomext-bottom"/>
+      <Button title="确认上传" icon="ui://eg2y0ldpr9ritjd"/>
+    </component>
+    <component id="n5_7dea" name="ComSelectRes" src="7dea4f" fileName="components/ComSelect.xml" xy="0,1162">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
     <component id="n10_i3ix" name="btnPhotograph" src="g3xa4h" fileName="components/Button8.xml" xy="940,409" group="n16_9ico">
       <gearDisplay controller="c1" pages="0"/>
       <Button icon="ui://mbo439wbnz0t5d"/>
     </component>
-    <component id="n6_g3xa" name="btnChoose" src="g3xa4h" fileName="components/Button8.xml" xy="940,554" group="n16_9ico">
+    <component id="n6_g3xa" name="btnChoose" src="g3xa4h" fileName="components/Button8.xml" xy="940,409" group="n16_9ico">
       <Button icon="ui://mbo439wbxmtl4s"/>
     </component>
-    <component id="n13_u7i8" name="btnUp" src="g3xa4h" fileName="components/Button8.xml" xy="940,699" group="n16_9ico">
+    <component id="n13_u7i8" name="btnUp" src="g3xa4h" fileName="components/Button8.xml" xy="940,554" group="n16_9ico">
       <Button icon="ui://mbo439wb9ico5f"/>
     </component>
-    <component id="n14_u7i8" name="btnDown" src="g3xa4h" fileName="components/Button8.xml" xy="940,844" group="n16_9ico">
+    <component id="n14_u7i8" name="btnDown" src="g3xa4h" fileName="components/Button8.xml" xy="940,699" group="n16_9ico">
       <Button icon="ui://mbo439wb9ico5e"/>
     </component>
-    <group id="n16_9ico" name="n16" xy="940,409" size="125,560" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
+    <group id="n16_9ico" name="n16" xy="940,409" size="125,415" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
   </displayList>

+ 6 - 4
FGUIProject/assets/DressUp/components/Button7.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="265,139" extention="Button">
+<component size="308,105" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n5_ih75" name="n5" src="xmtl4q" fileName="images/pz_xzzikuang.png" xy="0,0">
+    <image id="n6_r9ri" name="n6" src="i3ix5c" fileName="images/pz_xiantiao.png" xy="306,17" group="n7_r9ri"/>
+    <image id="n5_ih75" name="n5" src="xmtl4q" fileName="images/pz_xzzikuang.png" xy="-3,0" group="n7_r9ri">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <loader id="n2_ih75" name="icon" xy="79,46" size="106,69" url="ui://mbo439wbxmtl4p" autoSize="true"/>
-    <text id="n1_ih75" name="title" xy="0,-2" size="265,139" fontSize="42" color="#fff7eb" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <loader id="n2_ih75" name="icon" xy="111,40" size="86,44" group="n7_r9ri" url="ui://mbo439wbxmtl4p" 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>

+ 3 - 4
FGUIProject/assets/DressUp/components/ComSelect.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,834">
+<component size="1080,758">
   <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
     <image id="n15_xmtl" name="n15" src="xmtl4z" fileName="images/pz_dktu_1.png" xy="0,0"/>
-    <loader id="n5_7dea" name="n5" xy="0,192" size="1080,642" url="ui://mbo439wbxmtl4y" fill="scaleFree" autoSize="true"/>
-    <list id="n8_7dea" name="list" xy="-4,191" size="1088,644" layout="flow_hz" overflow="scroll" defaultItem="ui://mbo439wbxmtl57">
+    <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">
       <item/>
       <item/>
       <item/>
@@ -18,6 +18,5 @@
       <item/>
       <item/>
     </list>
-    <component id="n9_7dea" name="comBtnTab" src="xmtl56" fileName="components/Component2.xml" xy="0,63"/>
   </displayList>
 </component>

+ 12 - 12
FGUIProject/assets/DressUp/components/Component2.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,139" overflow="scroll" scroll="horizontal">
+<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="7dea4c" fileName="components/Button7.xml" xy="-8,0" size="265,139" group="n14_7dea">
-      <Button checked="true" icon="ui://mbo439wbxmtl4p" controller="c1" page="1"/>
+    <component id="n9_7dea" name="btn0" src="7dea4c" fileName="components/Button7.xml" xy="-8,0" group="n14_7dea">
+      <Button checked="true" icon="ui://mbo439wbr9rie9" selectedIcon="ui://mbo439wbxmtl4p" controller="c1" page="1"/>
     </component>
-    <component id="n10_7dea" name="btn1" src="7dea4c" fileName="components/Button7.xml" xy="257,0" size="265,139" group="n14_7dea">
-      <Button icon="ui://mbo439wbxmtl4o" controller="c1" page="2"/>
+    <component id="n10_7dea" name="btn1" src="7dea4c" fileName="components/Button7.xml" xy="300,0" group="n14_7dea">
+      <Button icon="ui://mbo439wbr9riea" selectedIcon="ui://mbo439wbxmtl4o" controller="c1" page="2"/>
     </component>
-    <component id="n11_7dea" name="btn2" src="7dea4c" fileName="components/Button7.xml" xy="522,0" size="265,139" group="n14_7dea">
-      <Button icon="ui://mbo439wbxmtl4n" controller="c1" page="3"/>
+    <component id="n11_7dea" name="btn2" src="7dea4c" fileName="components/Button7.xml" xy="608,0" group="n14_7dea">
+      <Button icon="ui://mbo439wbr9rieb" selectedIcon="ui://mbo439wbxmtl4n" controller="c1" page="3"/>
     </component>
-    <component id="n12_7dea" name="btn3" src="7dea4c" fileName="components/Button7.xml" xy="787,0" size="265,139" group="n14_7dea">
-      <Button icon="ui://mbo439wbxmtl54" controller="c1" page="4"/>
+    <component id="n12_7dea" name="btn3" src="7dea4c" fileName="components/Button7.xml" xy="916,0" group="n14_7dea">
+      <Button icon="ui://mbo439wbr9riec" selectedIcon="ui://mbo439wbxmtl54" controller="c1" page="4"/>
     </component>
-    <component id="n13_7dea" name="btn4" src="7dea4c" fileName="components/Button7.xml" xy="1052,0" size="265,139" group="n14_7dea">
-      <Button icon="ui://mbo439wbxmtl55" controller="c1" page="5"/>
+    <component id="n13_7dea" name="btn4" src="7dea4c" fileName="components/Button7.xml" xy="1224,0" group="n14_7dea">
+      <Button icon="ui://mbo439wbr9ried" selectedIcon="ui://mbo439wbxmtl55" controller="c1" page="5"/>
     </component>
-    <group id="n14_7dea" name="n14" xy="-8,0" size="1325,139" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <group id="n14_7dea" name="n14" xy="-8,0" size="1540,105" advanced="true" layout="hz" excludeInvisibles="true"/>
   </displayList>
 </component>

+ 8 - 6
FGUIProject/assets/DressUp/components/ListItem.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="272,272" extention="Button">
+<component size="250,272" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n3_xmtl" name="loaIcon" xy="66,66" size="140,140" aspect="true" url="ui://mbo439wb7dea4d" fill="scaleFree"/>
-    <image id="n4_xmtl" name="n4" src="xmtl50" fileName="images/pz_dituhua.png" xy="62,62"/>
-    <image id="n5_xmtl" name="n5" src="xmtl4r" fileName="images/pz_xzkuang.png" xy="20,20">
+    <image id="n4_xmtl" name="n4" src="xmtl50" fileName="images/pz_dituhua.png" xy="14,14" group="n8_r9ri"/>
+    <image id="n5_xmtl" name="n5" src="xmtl4r" fileName="images/pz_xzkuang.png" xy="0,0" group="n8_r9ri">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <text id="n6_xmtl" name="txtName" xy="136,185" pivot="0.5,0" anchor="true" size="206,46" fontSize="34" color="#e0f0da" strokeColor="#737f6e" text="沧海月明·月"/>
-    <image id="n7_i3ix" name="n7" src="i3ix5c" fileName="images/pz_xiantiao.png" xy="268,23"/>
+    <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"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

BIN
FGUIProject/assets/DressUp/images/pz_bjanniu_1.png


BIN
FGUIProject/assets/DressUp/images/pz_bjanniu_2.png


BIN
FGUIProject/assets/DressUp/images/pz_bjanniu_3.png


BIN
FGUIProject/assets/DressUp/images/pz_bjkuang.png


BIN
FGUIProject/assets/DressUp/images/pz_dituhua.png


BIN
FGUIProject/assets/DressUp/images/pz_dktu_1.png


BIN
FGUIProject/assets/DressUp/images/pz_pzanniu.png


BIN
FGUIProject/assets/DressUp/images/pz_sxsx_1.png


BIN
FGUIProject/assets/DressUp/images/pz_sxsx_2.png


BIN
FGUIProject/assets/DressUp/images/pz_xiantiao.png


BIN
FGUIProject/assets/DressUp/images/pz_xzanniu.png


BIN
FGUIProject/assets/DressUp/images/pz_xzkuang.png


BIN
FGUIProject/assets/DressUp/images/pz_xzzi_1.png


BIN
FGUIProject/assets/DressUp/images/pz_xzzi_2.png


BIN
FGUIProject/assets/DressUp/images/pz_xzzi_3.png


BIN
FGUIProject/assets/DressUp/images/pz_xzzi_4.png


BIN
FGUIProject/assets/DressUp/images/pz_xzzi_5.png


BIN
FGUIProject/assets/DressUp/images/pz_xzzikuang.png


BIN
FGUIProject/assets/DressUp/images/pz_zi_1.png


BIN
FGUIProject/assets/DressUp/images/pz_zi_2.png


BIN
FGUIProject/assets/DressUp/images/pz_zi_3.png


BIN
FGUIProject/assets/DressUp/images/pz_zi_4.png


BIN
FGUIProject/assets/DressUp/images/pz_zi_5.png


+ 7 - 0
FGUIProject/assets/DressUp/package.xml

@@ -174,6 +174,13 @@
     <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/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 83 - 1
GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs

@@ -12,13 +12,15 @@ 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" };
 
         public static void StartScan()
         {
             WriteClothingShop();
             WriteCJShop();
             WriteCJAShop();
-
+            WriteGalleryShop();
         }
 
         public static void WriteClothingShop()
@@ -232,5 +234,85 @@ namespace GFGEditor
                 SQLiteHelper.Instance.CloseConnection();
             }
         }
+
+
+        public static void WriteGalleryShop()
+        {
+            Dictionary<int, string> _typeIndexDic = new Dictionary<int, string>();
+
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                string typeIndex = "";
+                int itemId;
+                int id;
+                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgGalleryArray");
+                while (reader.Read())
+                {
+                    typeIndex = reader["_typeIndex"].ToString();
+                    itemId = int.Parse(reader["_itemId"].ToString());
+                    id = int.Parse(reader["_id"].ToString());
+
+                    int count = 2;
+
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+
+                    if (itemCfg.itemType == ConstItemType.DRESS_UP)
+                    {
+                        if (itemCfg.subType == ConstDressUpItemType.BEI_JING)
+                        {
+                            count = 0;//背景
+                        }
+                        else
+                        {
+                            count = 2;//道具
+                        }
+                    }
+                    else if (itemCfg.itemType == ConstItemType.PHOTOGRAPH)
+                    {
+                        if (itemCfg.subType == ConstItemSubType.NPC)
+                        {
+                            count = 1;//人物
+                        }
+                        else if (itemCfg.subType == ConstItemSubType.BOREDR)
+                        {
+                            count = 3;//npc
+                        }
+                    }
+
+                    _typeIndexDic.Add(id, count.ToString());
+                }
+            }
+            catch (System.Exception e)
+            {
+                ET.Log.Error(e);
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+
+
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                ICollection keys = _typeIndexDic.Keys;
+                foreach (int key in keys)
+                {
+
+                    var names = new string[] { "typeIndex" };
+                    var values = new string[] { "" + _typeIndexDic[key] };
+                    SQLiteHelper.Instance.UpdateValues(nameof(ShopCfgGalleryArray), names, values, "id", key.ToString());
+                }
+            }
+            catch (Exception e)
+            {
+                ET.Log.Error(e.ToString());
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+        }
     }
 }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComSelect.cs

@@ -8,8 +8,8 @@ namespace UI.DressUp
     {
         public GComponent target;
         public Controller m_c1;
-        public GList m_list;
         public UI_Component2 m_comBtnTab;
+        public GList m_list;
         public const string URL = "ui://mbo439wb7dea4f";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "ComSelect";
@@ -58,15 +58,15 @@ namespace UI.DressUp
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_list = (GList)comp.GetChild("list");
             m_comBtnTab = (UI_Component2)UI_Component2.Create(comp.GetChild("comBtnTab"));
+            m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_list = null;
             m_comBtnTab.Dispose();
             m_comBtnTab = null;
+            m_list = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographUI.cs

@@ -13,8 +13,8 @@ namespace UI.DressUp
         public GLoader m_loaGuide1;
         public UI_ComChecked m_comSelectBox;
         public GButton m_btnBack;
-        public UI_ComSelect m_ComSelectRes;
         public GButton m_btnGalleryJoin;
+        public UI_ComSelect m_ComSelectRes;
         public GButton m_btnPhotograph;
         public GButton m_btnChoose;
         public GButton m_btnUp;
@@ -72,8 +72,8 @@ namespace UI.DressUp
             m_loaGuide1 = (GLoader)comp.GetChild("loaGuide1");
             m_comSelectBox = (UI_ComChecked)UI_ComChecked.Create(comp.GetChild("comSelectBox"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_ComSelectRes = (UI_ComSelect)UI_ComSelect.Create(comp.GetChild("ComSelectRes"));
             m_btnGalleryJoin = (GButton)comp.GetChild("btnGalleryJoin");
+            m_ComSelectRes = (UI_ComSelect)UI_ComSelect.Create(comp.GetChild("ComSelectRes"));
             m_btnPhotograph = (GButton)comp.GetChild("btnPhotograph");
             m_btnChoose = (GButton)comp.GetChild("btnChoose");
             m_btnUp = (GButton)comp.GetChild("btnUp");
@@ -88,9 +88,9 @@ namespace UI.DressUp
             m_comSelectBox.Dispose();
             m_comSelectBox = null;
             m_btnBack = null;
+            m_btnGalleryJoin = null;
             m_ComSelectRes.Dispose();
             m_ComSelectRes = null;
-            m_btnGalleryJoin = null;
             m_btnPhotograph = null;
             m_btnChoose = null;
             m_btnUp = null;

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png


+ 0 - 96
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 0186270611f260245a9263096bf42e3d
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png


+ 0 - 96
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 2cd8da10ebf335a45948f5471dd6bb60
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes