Explorar o código

Merge branch 'master' of http://10.108.64.190:3000/gfg/client

# Conflicts:
#	GameClient/Assets/Game/Launcher/LauncherConfig.cs
guodong %!s(int64=2) %!d(string=hai) anos
pai
achega
7d05c7fd05
Modificáronse 100 ficheiros con 2064 adicións e 249 borrados
  1. 2 2
      FGUIProject/assets/Bag/BagUI.xml
  2. 1 1
      FGUIProject/assets/Bag/package.xml
  3. 1 1
      FGUIProject/assets/Card/package.xml
  4. 1 1
      FGUIProject/assets/ClothingDecompose/package.xml
  5. 6 6
      FGUIProject/assets/ClothingFoster/ClothingUI.xml
  6. 1 1
      FGUIProject/assets/ClothingFoster/package.xml
  7. 1 1
      FGUIProject/assets/ClothingShop/GalleryShopUI.xml
  8. 1 1
      FGUIProject/assets/ClothingShop/package.xml
  9. 6 6
      FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml
  10. 8 8
      FGUIProject/assets/CommonGame/components/ComponentValueBar.xml
  11. 1 1
      FGUIProject/assets/CreateRole/package.xml
  12. 1 1
      FGUIProject/assets/DailyLogin/package.xml
  13. 1 1
      FGUIProject/assets/DailyTask/package.xml
  14. 4 1
      FGUIProject/assets/DressUp/DressUpFightUI.xml
  15. 1 1
      FGUIProject/assets/Field/package.xml
  16. 1 1
      FGUIProject/assets/Friend/package.xml
  17. 1 1
      FGUIProject/assets/Loading/package.xml
  18. 60 60
      FGUIProject/assets/Main/MainUI.xml
  19. 1 0
      FGUIProject/assets/Main/components/ButtonModle1.xml
  20. 24 0
      FGUIProject/assets/Main/components/ButtonModle2.xml
  21. 23 0
      FGUIProject/assets/Main/components/ButtonModle3.xml
  22. 23 0
      FGUIProject/assets/Main/components/ButtonModle4.xml
  23. 23 0
      FGUIProject/assets/Main/components/ButtonModle5.xml
  24. 23 0
      FGUIProject/assets/Main/components/ButtonModle6.xml
  25. 23 0
      FGUIProject/assets/Main/components/ButtonModle7.xml
  26. BIN=BIN
      FGUIProject/assets/Main/images/zjm_tptp_1.png
  27. BIN=BIN
      FGUIProject/assets/Main/images/zjm_tptp_2.png
  28. BIN=BIN
      FGUIProject/assets/Main/images/zjm_tptp_3.png
  29. BIN=BIN
      FGUIProject/assets/Main/images/zjm_tptp_4.png
  30. BIN=BIN
      FGUIProject/assets/Main/images/zjm_tptp_5.png
  31. BIN=BIN
      FGUIProject/assets/Main/images/zjm_tptp_6.png
  32. 12 0
      FGUIProject/assets/Main/package.xml
  33. 1 1
      FGUIProject/assets/Notice/package.xml
  34. 1 1
      FGUIProject/assets/RoleInfo/package.xml
  35. 1 1
      FGUIProject/assets/RoleLvUp/package.xml
  36. 1 1
      FGUIProject/assets/Studio/package.xml
  37. 1 1
      FGUIProject/assets/Travel/package.xml
  38. 1 1
      FGUIProject/assets/poem/package.xml
  39. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs
  40. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle2.cs
  41. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle2.cs.meta
  42. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle3.cs
  43. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle3.cs.meta
  44. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle4.cs
  45. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle4.cs.meta
  46. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle5.cs
  47. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle5.cs.meta
  48. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle6.cs
  49. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle6.cs.meta
  50. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle7.cs
  51. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle7.cs.meta
  52. 41 33
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  53. 24 26
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  54. 1 1
      GameClient/Assets/Game/Launcher/LauncherConfig.cs
  55. BIN=BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  56. 2 85
      GameClient/Assets/ResIn/Prefab/SceneMain.prefab
  57. BIN=BIN
      GameClient/Assets/ResIn/UI/Bag/Bag_atlas0!a.png
  58. 96 0
      GameClient/Assets/ResIn/UI/Bag/Bag_atlas0!a.png.meta
  59. BIN=BIN
      GameClient/Assets/ResIn/UI/Bag/Bag_atlas0.png
  60. BIN=BIN
      GameClient/Assets/ResIn/UI/Bag/Bag_fui.bytes
  61. BIN=BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png
  62. 96 0
      GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png.meta
  63. BIN=BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0.png
  64. BIN=BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png
  65. 96 0
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png.meta
  66. BIN=BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_1.png
  67. BIN=BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_2!a.png
  68. 96 0
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_2!a.png.meta
  69. BIN=BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_2.png
  70. BIN=BIN
      GameClient/Assets/ResIn/UI/Card/Card_fui.bytes
  71. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0!a.png
  72. 96 0
      GameClient/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0!a.png.meta
  73. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0.png
  74. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0!a.png
  75. 96 0
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0!a.png.meta
  76. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0.png
  77. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1!a.png
  78. 96 0
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1!a.png.meta
  79. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1.png
  80. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes
  81. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png
  82. 96 0
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png.meta
  83. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png
  84. 39 3
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png.meta
  85. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62!a.png
  86. 96 0
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62!a.png.meta
  87. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62.png
  88. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes
  89. BIN=BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes
  90. BIN=BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  91. BIN=BIN
      GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0!a.png
  92. 96 0
      GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0!a.png.meta
  93. BIN=BIN
      GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0.png
  94. BIN=BIN
      GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0!a.png
  95. 96 0
      GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0!a.png.meta
  96. BIN=BIN
      GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0.png
  97. BIN=BIN
      GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1!a.png
  98. 96 0
      GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1!a.png.meta
  99. BIN=BIN
      GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1.png
  100. BIN=BIN
      GameClient/Assets/ResIn/UI/DailyTask/DailyTask_atlas0!a.png

+ 2 - 2
FGUIProject/assets/Bag/BagUI.xml

@@ -4,14 +4,14 @@
     <loader id="n13_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="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" group="n17_si5z">
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n17_si5z">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n6_wet2" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n17_si5z">
       <Button icon="ui://2bsz6nelsi5zti3"/>
     </component>
     <image id="n14_si5z" name="n14" src="si5zti6" fileName="images/wpbb_xtxt.png" xy="54,312" group="n17_si5z"/>
-    <group id="n17_si5z" name="grpTop" xy="0,90" size="1080,234"/>
+    <group id="n17_si5z" name="grpTop" xy="0,95" size="1080,229"/>
     <list id="n0_lh8v" name="list" xy="33,390" size="1013,1530" layout="flow_hz" overflow="scroll" lineGap="82" colGap="43" defaultItem="ui://2bsz6nelsi5zti7" autoClearItems="true">
       <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
       <item/>

+ 1 - 1
FGUIProject/assets/Bag/package.xml

@@ -7,5 +7,5 @@
     <image id="si5zti6" name="wpbb_xtxt.png" path="/images/"/>
     <component id="si5zti7" name="ListItem.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Bag" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Bag" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Card/package.xml

@@ -99,5 +99,5 @@
     <image id="r9ri9x" name="kp_mudan.jpg" path="/images/"/>
     <image id="ysx99y" name="cpcp_ziti.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/ClothingDecompose/package.xml

@@ -31,5 +31,5 @@
     <image id="qyr6u" name="fzfj_yijanniu_4.png" path="/images/"/>
     <component id="qyr6v" name="ComBtnTab.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingDecompose" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingDecompose" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 6 - 6
FGUIProject/assets/ClothingFoster/ClothingUI.xml

@@ -10,7 +10,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n42_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,6"/>
+    <component id="n42_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6"/>
     <loader id="n18_py5g" name="loaRarity" xy="940,140" size="54,224" url="ui://eg2y0ldpqdrt15" autoSize="true"/>
     <image id="n37_l4ui" name="n37" src="l4ui26" fileName="images/fzyc_yhditu_2.png" xy="0,1336">
       <relation target="" sidePair="bottom-bottom"/>
@@ -34,10 +34,10 @@
     <group id="n41_r9ri" name="n41" xy="346,1128" size="387,78" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <text id="n22_nk8d" name="txtRenewProperty" xy="357,1386" size="365,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
-    <component id="n26_nk8d" name="comRenewCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="400,1717" group="n29_nk8d"/>
+    <text id="n22_nk8d" name="txtRenewProperty" xy="357,1386" size="353,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
+    <component id="n26_nk8d" name="comRenewCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="400,1717" size="237,46" group="n29_nk8d"/>
     <component id="n27_nk8d" name="btnRenew" src="bd1c1r" fileName="components/Button8.xml" xy="368,1766" group="n29_nk8d"/>
-    <text id="n28_nk8d" name="txtRenewTips" xy="442,1851" size="196,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
+    <text id="n28_nk8d" name="txtRenewTips" xy="442,1851" size="193,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
     <component id="n23_nk8d" name="comRenewReward" src="nk8d14" fileName="components/ComRenewReward.xml" xy="68,1411" size="300,300" group="n39_l4ui"/>
     <list id="n25_nk8d" name="listRenewMaterial" xy="428,1468" size="584,216" group="n39_l4ui" layout="row" colGap="36" defaultItem="ui://uicwtr5bpy5gu" align="center">
       <item/>
@@ -71,8 +71,8 @@
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <text id="n30_nk8d" name="n30" xy="414,1410" size="252,66" group="n34_nk8d" fontSize="50" color="#aa9063" text="已完成焕新"/>
-    <text id="n31_nk8d" name="txtRenewShow" xy="336,1506" size="408,51" group="n34_nk8d" fontSize="38" color="#aa9063" text="套装所有部件属性+10%"/>
+    <text id="n30_nk8d" name="n30" xy="414,1410" size="248,66" group="n34_nk8d" fontSize="50" color="#aa9063" text="已完成焕新"/>
+    <text id="n31_nk8d" name="txtRenewShow" xy="336,1506" size="395,51" group="n34_nk8d" fontSize="38" color="#aa9063" text="套装所有部件属性+10%"/>
     <component id="n32_nk8d" name="comRenewRewardGet" src="nk8d15" fileName="components/ComRenewRewardGet.xml" xy="390,1578" group="n34_nk8d"/>
     <group id="n34_nk8d" name="grpRenewFinish" xy="336,1410" size="408,468" advanced="true">
       <gearDisplay controller="c1" pages="1"/>

+ 1 - 1
FGUIProject/assets/ClothingFoster/package.xml

@@ -84,5 +84,5 @@
     <image id="ysx92p" name="tujian_ditup.png" path="/images/"/>
     <image id="weok2q" name="fzyh_fzyh.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingFoster" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingFoster" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/ClothingShop/GalleryShopUI.xml

@@ -7,7 +7,7 @@
     <component id="n1_yd72" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="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="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,95" controller="c1,9"/>
     <image id="n19_r9ri" name="n19" src="r9rieh" fileName="images/jfsc_dik.png" xy="625,0"/>
     <image id="n22_r9ri" name="n22" src="r9ri6r" fileName="images/jfsc_xiantiao_1.png" xy="665,371" group="n21_r9ri"/>
     <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="706,636" group="n21_r9ri">

+ 1 - 1
FGUIProject/assets/ClothingShop/package.xml

@@ -73,5 +73,5 @@
     <image id="v95qek" name="fzd_kuangdidi.png" path="/images/"/>
     <image id="v95qel" name="fzd_xiant_2.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 6 - 6
FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="240,62" extention="Button">
+<component size="240,70" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-7,9" group="n4_qqat"/>
-    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="183,7" group="n4_qqat"/>
-    <text id="n1_r9gf" name="title" xy="49,10" pivot="0.5,0" size="126,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="1000000"/>
-    <loader id="n2_r9gf" name="icon" xy="4,9" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
-    <group id="n4_qqat" name="n4" xy="-7,7" size="236,47"/>
+    <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-7,13" group="n4_qqat"/>
+    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="183,11" group="n4_qqat"/>
+    <text id="n1_r9gf" name="title" xy="53,14" pivot="0.5,0" size="117,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="1000000"/>
+    <loader id="n2_r9gf" name="icon" xy="4,13" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
+    <group id="n4_qqat" name="n4" xy="-7,11" size="236,47"/>
   </displayList>
   <Button/>
 </component>

+ 8 - 8
FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,62" opaque="false">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10," selected="9">
+<component size="1080,70" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10," selected="0">
     <remark page="0" value="体力金币马蹄珍珠"/>
     <remark page="1" value="体力金币马蹄"/>
     <remark page="2" value="抽卡兑换"/>
@@ -13,32 +13,32 @@
     <remark page="9" value="金币马蹄珍珠"/>
   </controller>
   <displayList>
-    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,0">
       <gearDisplay controller="c1" pages="3"/>
       <gearXY controller="c1" pages="0,3" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,0">
       <gearDisplay controller="c1" pages="4"/>
       <gearXY controller="c1" pages="0,4" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="8"/>
       <gearXY controller="c1" pages="0,1,5,6,8" values="814,0|684,2|684,2|684,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="9"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,9" values="814,0|684,2|814,2|684,2|684,2|814,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpdhoatk2"/>
     </component>
-    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="0,5">
+    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="37,0">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearXY controller="c1" pages="0,1,5" values="37,0|296,0|296,5" default="0,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="-215,0">
       <gearDisplay controller="c1" pages="5"/>
       <gearXY controller="c1" pages="0,1,3,5" values="-215,0|1079,5|979,5|296,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>

+ 1 - 1
FGUIProject/assets/CreateRole/package.xml

@@ -6,5 +6,5 @@
     <component id="xt5s4" name="ButtonDice.xml" path="/components/"/>
     <image id="hpgr5" name="mc_jlkuang_1.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\CreateRole" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\CreateRole" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/DailyLogin/package.xml

@@ -15,5 +15,5 @@
     <image id="ox5bi" name="yzhd_zszs.png" path="/images/"/>
     <component id="rkrwj" name="Component1.xml" path="/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyLogin" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyLogin" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/DailyTask/package.xml

@@ -21,5 +21,5 @@
     <image id="wet22l" name="mrqd_xian.png" path="/images/"/>
     <image id="slkg2m" name="mrqd_anniu_5.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyTask" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyTask" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 4 - 1
FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -2,6 +2,9 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
+    <loader id="n48_mzf8" name="loaBg" xy="0,0" size="1080,1920" touchable="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
     <graph id="n0_qsvd" name="touchPad" xy="0,0" size="1080,1920" alpha="0" type="rect">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
@@ -79,7 +82,7 @@
     <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="355,1642" group="n38_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="327,44" group="n38_8lqj" visible="false" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数:{v1=10}/{v2=10}">
+    <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="314,44" group="n38_8lqj" visible="false" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数:{v1=10}/{v2=10}">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     <group id="n38_8lqj" name="graContent" xy="0,0" size="1310,1920" advanced="true">

+ 1 - 1
FGUIProject/assets/Field/package.xml

@@ -34,5 +34,5 @@
     <component id="ohunz" name="ProgressBar1.xml" path="/components/"/>
     <image id="wet210" name="tydc_dikuang_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Field" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Field" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Friend/package.xml

@@ -48,5 +48,5 @@
     <image id="z73e1c" name="dz_hz_rwdh_1.png" path="/images/"/>
     <image id="gmjo1d" name="hy_dikuang_4.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Friend" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Friend" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Loading/package.xml

@@ -11,5 +11,5 @@
     <image id="pac99" name="dljm_jdq_4.png" path="/images/"/>
     <image id="pac9a" name="dljm_jdq_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Loading" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Loading" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 60 - 60
FGUIProject/assets/Main/MainUI.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetX="1080" designImageOffsetY="-240">
+<component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetY="-240">
   <displayList>
+    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" group="n59_oju1"/>
     <image id="n68_v95q" name="n68" src="v95qi0" fileName="images/zjm_mbmbmb.png" xy="0,1448" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
@@ -33,33 +34,9 @@
       <Button icon="ui://mfvz4q8kv482fq"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhw"/>
     </component>
-    <group id="n52_qqat" name="grpLeft" xy="0,160" size="1080,1760" group="n59_oju1" advanced="true"/>
-    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1838,621" size="87,293" group="n58_oju1">
-      <relation target="" sidePair="middle-middle"/>
-      <Button icon="ui://mfvz4q8kv482ft"/>
-      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-    </component>
-    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="1998,1552" size="87,294" group="n58_oju1">
-      <relation target="" sidePair="middle-middle"/>
-      <Button icon="ui://mfvz4q8kv482fv"/>
-      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-    </component>
-    <component id="n51_v482" name="btnPoem" src="q08xu" fileName="components/ButtonModle1.xml" xy="1576,1431" size="87,294" group="n58_oju1">
-      <relation target="" sidePair="middle-middle"/>
-      <Button icon="ui://mfvz4q8kv482fr"/>
-      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
+    <component id="n69_weok" name="loaRight" src="weokii" fileName="components/Component7.xml" xy="918,1447" group="n52_qqat">
+      <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n60_wono" name="btnTravel" src="q08xu" fileName="components/ButtonModle1.xml" xy="2005,840" size="87,293" group="n58_oju1">
-      <relation target="" sidePair="middle-middle"/>
-      <Button icon="ui://mfvz4q8kwonohg"/>
-      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-    </component>
-    <group id="n58_oju1" name="grpRight" xy="1576,621" size="516,1225" group="n59_oju1" advanced="true"/>
-    <component id="n69_weok" name="loaRight" src="weokii" fileName="components/Component7.xml" xy="918,1447" group="n64_v95q"/>
-    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="1140,1565" pivot="0.5,0.5" anchor="true" size="200,234" group="n64_v95q" scale="-1,1"/>
-    <group id="n64_v95q" name="n64" xy="918,1447" size="322,235" group="n59_oju1" advanced="true"/>
-    <group id="n59_oju1" name="grpMove" xy="0,160" size="2092,1760" advanced="true"/>
-    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95"/>
     <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
       <relation target="" sidePair="right-right,top-top"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
@@ -76,45 +53,68 @@
     <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="964,466" pivot="0.5,0" anchor="true" group="n57_oju1">
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
-    <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" advanced="true"/>
+    <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" group="n52_qqat" advanced="true"/>
+    <group id="n52_qqat" name="grpLeft" xy="0,160" size="1118,1760" group="n59_oju1" advanced="true"/>
+    <component id="n73_mzf8" name="btn0" src="mzf8it" fileName="components/ButtonModle6.xml" xy="70,447" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kmzf8in"/>
+      <property target="loaLockIcon" propertyId="1" value=""/>
+      <property target="icon1" propertyId="1" value=""/>
+    </component>
+    <component id="n72_mzf8" name="btn1" src="mzf8iu" fileName="components/ButtonModle7.xml" xy="615,1195" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kmzf8ik"/>
+      <property target="loaLockIcon" propertyId="1" value=""/>
+      <property target="icon1" propertyId="1" value=""/>
+    </component>
+    <component id="n44_n3xh" name="btnStudio" src="mzf8ip" fileName="components/ButtonModle2.xml" xy="343,673" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kmzf8im"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482ft"/>
+    </component>
+    <component id="n60_wono" name="btnTravel" src="mzf8iq" fileName="components/ButtonModle3.xml" xy="753,893" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kmzf8il"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kwonohg"/>
+    </component>
+    <component id="n51_v482" name="btnPoem" src="mzf8is" fileName="components/ButtonModle5.xml" xy="118,1487" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kmzf8ij"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fr"/>
+    </component>
+    <component id="n45_kqhd" name="btnField" src="mzf8ir" fileName="components/ButtonModle4.xml" xy="663,1584" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kmzf8io"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fv"/>
+    </component>
+    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="58,1634" pivot="0.5,0.5" anchor="true" size="200,234" group="n58_oju1" scale="-1,1"/>
+    <group id="n58_oju1" name="grpRight" xy="-41,447" size="1121,1497" group="n59_oju1" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <group id="n59_oju1" name="grpMove" xy="-41,90" size="1159,1854" advanced="true"/>
     <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
+    <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" touchable="false" type="rect" lineSize="0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
   </displayList>
   <transition name="t1">
-    <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
-    <item time="0" type="Alpha" target="n58_oju1" value="0"/>
-    <item time="0" type="Visible" target="n69_weok" value="true"/>
-    <item time="0" type="Visible" target="n70_weok" value="false"/>
-    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="0,160" endValue="-1080,160" duration="24" ease="Circ.InOut"/>
-    <item time="6" type="Alpha" target="n52_qqat" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
-    <item time="6" type="Visible" target="n57_oju1" value="false"/>
-    <item time="12" type="Visible" target="n69_weok" value="false"/>
-    <item time="15" type="Alpha" target="n58_oju1" tween="true" startValue="0" endValue="1" duration="7" ease="Linear"/>
-    <item time="24" type="Visible" target="n70_weok" value="true"/>
+    <item time="0" type="Alpha" target="n71_mzf8" tween="true" startValue="0" endValue="1" duration="10" ease="Linear"/>
+    <item time="12" type="Visible" target="n52_qqat" value="false"/>
+    <item time="12" type="Visible" target="n58_oju1" value="true"/>
+    <item time="14" type="Alpha" target="n71_mzf8" tween="true" startValue="1" endValue="0" duration="10" ease="Linear"/>
   </transition>
   <transition name="t2">
-    <item time="0" type="Alpha" target="n52_qqat" value="0"/>
-    <item time="0" type="Alpha" target="n57_oju1" value="0"/>
-    <item time="0" type="Visible" target="n69_weok" value="false"/>
-    <item time="0" type="Visible" target="n70_weok" value="true"/>
-    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="-1080,160" endValue="0,160" duration="24" ease="Circ.InOut"/>
-    <item time="6" type="Alpha" target="n58_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
-    <item time="12" type="Alpha" target="n52_qqat" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
-    <item time="12" type="Visible" target="n70_weok" value="false"/>
-    <item time="18" type="Alpha" target="n57_oju1" tween="true" startValue="0" endValue="1" duration="5" ease="Linear"/>
-    <item time="18" type="Visible" target="n57_oju1" value="true"/>
-    <item time="24" type="Visible" target="n69_weok" value="true"/>
+    <item time="0" type="Alpha" target="n71_mzf8" tween="true" startValue="0" endValue="1" duration="10" ease="Linear"/>
+    <item time="12" type="Visible" target="n52_qqat" value="true"/>
+    <item time="12" type="Visible" target="n58_oju1" value="false"/>
+    <item time="14" type="Alpha" target="n71_mzf8" tween="true" startValue="1" endValue="0" duration="10" ease="Linear"/>
   </transition>
-  <transition name="t4">
-    <item time="0" type="Visible" target="n57_oju1" value="false"/>
-    <item time="0" type="Visible" target="n69_weok" value="false"/>
-    <item time="0" type="XY" target="n59_oju1" value="-1080,160"/>
+  <transition name="t3">
+    <item time="0" type="Alpha" target="n71_mzf8" value="0"/>
+    <item time="0" type="Visible" target="n52_qqat" value="true"/>
+    <item time="0" type="Visible" target="n58_oju1" value="false"/>
   </transition>
-  <transition name="t11">
-    <item time="0" type="Alpha" target="n52_qqat" tween="true" startValue="0" endValue="1" duration="1" ease="Linear"/>
-    <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="0" endValue="1" duration="1" ease="Linear"/>
-    <item time="0" type="Alpha" target="n58_oju1" tween="true" startValue="1" endValue="0" duration="1" ease="Linear"/>
-    <item time="0" type="Visible" target="n70_weok" value="false"/>
-    <item time="0" type="XY" target="n59_oju1" value="0,160"/>
-    <item time="1" type="Visible" target="n57_oju1" value="true"/>
+  <transition name="t4">
+    <item time="0" type="Alpha" target="n71_mzf8" value="0"/>
+    <item time="0" type="Visible" target="n52_qqat" value="false"/>
+    <item time="0" type="Visible" target="n58_oju1" value="true"/>
   </transition>
 </component>

+ 1 - 0
FGUIProject/assets/Main/components/ButtonModle1.xml

@@ -18,4 +18,5 @@
   <Button/>
   <relation target="n1_wg7t" sidePair="width-width,height-height"/>
   <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
 </component>

+ 24 - 0
FGUIProject/assets/Main/components/ButtonModle2.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="560,383" opaque="false" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="280,271" size="0,0" group="n13_mzf8" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <image id="n11_mzf8" name="n11" src="mzf8im" fileName="images/zjm_tptp_3.png" xy="-205,80" group="n13_mzf8"/>
+    <graph id="n4_lki4" name="holder1" xy="280,271" size="0,0" group="n13_mzf8" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n10_mzf8" name="icon1" xy="428,0" size="77,256" group="n13_mzf8" url="ui://mfvz4q8kv482fs" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n8_v95q" name="loaLockIcon" xy="429,0" size="76,255" group="n13_mzf8" url="ui://mfvz4q8kv95qhz" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n16_mzf8" name="n16" xy="17,97" size="419,286" group="n13_mzf8"/>
+    <group id="n13_mzf8" name="n13" xy="-205,0" size="772,476"/>
+  </displayList>
+  <Button/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

+ 23 - 0
FGUIProject/assets/Main/components/ButtonModle3.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="327,313" opaque="false" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="163,236" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <image id="n11_mzf8" name="n11" src="mzf8il" fileName="images/zjm_tptp_2.png" xy="0,22"/>
+    <graph id="n4_lki4" name="holder1" xy="163,236" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n10_mzf8" name="icon1" xy="195,0" size="77,256" url="ui://mfvz4q8kv482fs" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n8_v95q" name="loaLockIcon" xy="196,0" size="76,255" url="ui://mfvz4q8kv95qhz" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n14_mzf8" name="n14" xy="29,109" size="193,194"/>
+  </displayList>
+  <Button/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

+ 23 - 0
FGUIProject/assets/Main/components/ButtonModle4.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="312,360" opaque="false" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="155,279" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <image id="n11_mzf8" name="n11" src="mzf8io" fileName="images/zjm_tptp_5.png" xy="0,100"/>
+    <graph id="n4_lki4" name="holder1" xy="155,279" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n10_mzf8" name="icon1" xy="230,0" size="77,256" url="ui://mfvz4q8kv482fs" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n8_v95q" name="loaLockIcon" xy="231,0" size="76,255" url="ui://mfvz4q8kv95qhz" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n13_mzf8" name="n13" xy="28,141" size="215,194"/>
+  </displayList>
+  <Button/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

+ 23 - 0
FGUIProject/assets/Main/components/ButtonModle5.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="535,328" opaque="false" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="266,163" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <image id="n11_mzf8" name="n11" src="mzf8ij" fileName="images/zjm_tptp_6.png" xy="-117,138"/>
+    <graph id="n4_lki4" name="holder1" xy="266,163" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n10_mzf8" name="icon1" xy="453,3" size="77,256" url="ui://mfvz4q8kv482fs" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n8_v95q" name="loaLockIcon" xy="454,3" size="76,255" url="ui://mfvz4q8kv95qhz" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n12_mzf8" name="n12" xy="29,132" size="435,194"/>
+  </displayList>
+  <Button/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

+ 23 - 0
FGUIProject/assets/Main/components/ButtonModle6.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="339,523" opaque="false" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="168,260" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <image id="n11_mzf8" name="n11" src="mzf8ik" fileName="images/zjm_tptp_1.png" xy="-71,18"/>
+    <graph id="n4_lki4" name="holder1" xy="168,260" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n10_mzf8" name="icon1" xy="262,3" size="77,256" url="ui://mfvz4q8kv482fs" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n8_v95q" name="loaLockIcon" xy="263,3" size="76,255" url="ui://mfvz4q8kv95qhz" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n12_mzf8" name="n12" xy="70,22" size="130,502"/>
+  </displayList>
+  <Button/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

+ 23 - 0
FGUIProject/assets/Main/components/ButtonModle7.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="339,281" opaque="false" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="168,139" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <image id="n11_mzf8" name="n11" src="mzf8in" fileName="images/zjm_tptp_4.png" xy="0,72"/>
+    <graph id="n4_lki4" name="holder1" xy="168,139" size="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n10_mzf8" name="icon1" xy="262,3" size="77,256" url="ui://mfvz4q8kv482fs" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n8_v95q" name="loaLockIcon" xy="263,3" size="76,255" url="ui://mfvz4q8kv95qhz" autoSize="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </loader>
+    <loader id="n12_mzf8" name="n12" xy="4,88" size="258,194"/>
+  </displayList>
+  <Button/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

BIN=BIN
FGUIProject/assets/Main/images/zjm_tptp_1.png


BIN=BIN
FGUIProject/assets/Main/images/zjm_tptp_2.png


BIN=BIN
FGUIProject/assets/Main/images/zjm_tptp_3.png


BIN=BIN
FGUIProject/assets/Main/images/zjm_tptp_4.png


BIN=BIN
FGUIProject/assets/Main/images/zjm_tptp_5.png


BIN=BIN
FGUIProject/assets/Main/images/zjm_tptp_6.png


+ 12 - 0
FGUIProject/assets/Main/package.xml

@@ -439,6 +439,18 @@
     <image id="ysx9ig" name="fzl_fzl.png" path="/images/"/>
     <image id="weokih" name="zjm_22.png" path="/images/"/>
     <component id="weokii" name="Component7.xml" path="/components/"/>
+    <image id="mzf8ij" name="zjm_tptp_6.png" path="/images/"/>
+    <image id="mzf8ik" name="zjm_tptp_1.png" path="/images/"/>
+    <image id="mzf8il" name="zjm_tptp_2.png" path="/images/"/>
+    <image id="mzf8im" name="zjm_tptp_3.png" path="/images/"/>
+    <image id="mzf8in" name="zjm_tptp_4.png" path="/images/"/>
+    <image id="mzf8io" name="zjm_tptp_5.png" path="/images/"/>
+    <component id="mzf8ip" name="ButtonModle2.xml" path="/components/"/>
+    <component id="mzf8iq" name="ButtonModle3.xml" path="/components/"/>
+    <component id="mzf8ir" name="ButtonModle4.xml" path="/components/"/>
+    <component id="mzf8is" name="ButtonModle5.xml" path="/components/"/>
+    <component id="mzf8it" name="ButtonModle6.xml" path="/components/"/>
+    <component id="mzf8iu" name="ButtonModle7.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Notice/package.xml

@@ -30,5 +30,5 @@
     <component id="kjq3t" name="NoticeSystemShowUI.xml" path="/" exported="true"/>
     <component id="kjq3u" name="ComContent.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Notice" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Notice" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/RoleInfo/package.xml

@@ -76,5 +76,5 @@
     <component id="v95qg3" name="ListHeadBorderItem.xml" path="/components/"/>
     <image id="ysx9gg" name="zjm_dj_1.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleInfo" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleInfo" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/RoleLvUp/package.xml

@@ -8,5 +8,5 @@
     <component id="mueb4" name="Component1.xml" path="/components/"/>
     <component id="mueb5" name="Component2.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleLvUp" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleLvUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Studio/package.xml

@@ -74,5 +74,5 @@
     <image id="wono2t" name="yizugongzhu.png" path="/imgExpot/" exported="true"/>
     <image id="ysx92u" name="gzs_gzs.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Travel/package.xml

@@ -50,5 +50,5 @@
     <component id="wono1d" name="ComPostcard.xml" path="/components/"/>
     <image id="pac910f" name="xqfs_ylxfdi.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Travel" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Travel" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/poem/package.xml

@@ -143,5 +143,5 @@
     <image id="pac9tjx" name="hl_cjkuangdiban.png" path="/imagesGallery/" scale="9grid" scale9grid="123,177,246,354"/>
     <image id="pac9tjy" name="tz_bolangg.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -8,6 +8,7 @@ namespace UI.DressUp
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_loaBg;
         public GGraph m_touchPad;
         public GComboBox m_comboBox;
         public GButton m_btnBack;
@@ -82,6 +83,7 @@ namespace UI.DressUp
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_touchPad = (GGraph)comp.GetChild("touchPad");
             m_comboBox = (GComboBox)comp.GetChild("comboBox");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -112,6 +114,7 @@ namespace UI.DressUp
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_loaBg = null;
             m_touchPad = null;
             m_comboBox = null;
             m_btnBack = null;

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle2.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonModle2
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GLoader m_icon1;
+        public GLoader m_loaLockIcon;
+        public const string URL = "ui://mfvz4q8kmzf8ip";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonModle2";
+        private static UI_ButtonModle2 _proxy;
+
+        public static UI_ButtonModle2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonModle2();
+            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_ButtonModle2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonModle2();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_holder1 = null;
+            m_icon1 = null;
+            m_loaLockIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle2.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle3.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonModle3
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GLoader m_icon1;
+        public GLoader m_loaLockIcon;
+        public const string URL = "ui://mfvz4q8kmzf8iq";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonModle3";
+        private static UI_ButtonModle3 _proxy;
+
+        public static UI_ButtonModle3 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonModle3();
+            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_ButtonModle3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonModle3();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_holder1 = null;
+            m_icon1 = null;
+            m_loaLockIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle3.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle4.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonModle4
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GLoader m_icon1;
+        public GLoader m_loaLockIcon;
+        public const string URL = "ui://mfvz4q8kmzf8ir";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonModle4";
+        private static UI_ButtonModle4 _proxy;
+
+        public static UI_ButtonModle4 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonModle4();
+            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_ButtonModle4 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonModle4();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_holder1 = null;
+            m_icon1 = null;
+            m_loaLockIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle4.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle5.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonModle5
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GLoader m_icon1;
+        public GLoader m_loaLockIcon;
+        public const string URL = "ui://mfvz4q8kmzf8is";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonModle5";
+        private static UI_ButtonModle5 _proxy;
+
+        public static UI_ButtonModle5 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonModle5();
+            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_ButtonModle5 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonModle5();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_holder1 = null;
+            m_icon1 = null;
+            m_loaLockIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle5.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle6.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonModle6
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GLoader m_icon1;
+        public GLoader m_loaLockIcon;
+        public const string URL = "ui://mfvz4q8kmzf8it";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonModle6";
+        private static UI_ButtonModle6 _proxy;
+
+        public static UI_ButtonModle6 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonModle6();
+            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_ButtonModle6 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonModle6();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_holder1 = null;
+            m_icon1 = null;
+            m_loaLockIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle6.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle7.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonModle7
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GLoader m_icon1;
+        public GLoader m_loaLockIcon;
+        public const string URL = "ui://mfvz4q8kmzf8iu";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonModle7";
+        private static UI_ButtonModle7 _proxy;
+
+        public static UI_ButtonModle7 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonModle7();
+            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_ButtonModle7 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonModle7();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_holder1 = null;
+            m_icon1 = null;
+            m_loaLockIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle7.cs.meta

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

+ 41 - 33
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_MainUI
     {
         public GComponent target;
+        public GComponent m_valueBar;
         public UI_ComponentHeadBar m_headBar;
         public UI_Button2 m_btnDailyLogin;
         public UI_ButtonModle1 m_btnMain;
@@ -14,24 +15,25 @@ namespace UI.Main
         public UI_ButtonModle1 m_btnXiuFang;
         public UI_ButtonModle1 m_btnCiPai;
         public UI_ButtonModle1 m_btnZhaiXing;
-        public GGroup m_grpLeft;
-        public UI_ButtonModle1 m_btnStudio;
-        public UI_ButtonModle1 m_btnField;
-        public UI_ButtonModle1 m_btnPoem;
-        public UI_ButtonModle1 m_btnTravel;
-        public GGroup m_grpRight;
         public UI_Component7 m_loaRight;
-        public UI_Component7 m_loaLeft;
-        public GGroup m_grpMove;
-        public GComponent m_valueBar;
         public GList m_list;
         public UI_ButtonChange m_btnChange;
         public GGroup m_grpList;
+        public GGroup m_grpLeft;
+        public UI_ButtonModle6 m_btn0;
+        public UI_ButtonModle7 m_btn1;
+        public UI_ButtonModle2 m_btnStudio;
+        public UI_ButtonModle3 m_btnTravel;
+        public UI_ButtonModle5 m_btnPoem;
+        public UI_ButtonModle4 m_btnField;
+        public UI_Component7 m_loaLeft;
+        public GGroup m_grpRight;
+        public GGroup m_grpMove;
         public GLoader m_loaGuidestudio;
         public Transition m_t1;
         public Transition m_t2;
+        public Transition m_t3;
         public Transition m_t4;
-        public Transition m_t11;
         public const string URL = "ui://mfvz4q8kq08x0";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "MainUI";
@@ -79,6 +81,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnDailyLogin = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyLogin"));
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
@@ -86,27 +89,29 @@ namespace UI.Main
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
             m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
-            m_grpLeft = (GGroup)comp.GetChild("grpLeft");
-            m_btnStudio = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnStudio"));
-            m_btnField = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnField"));
-            m_btnPoem = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnPoem"));
-            m_btnTravel = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnTravel"));
-            m_grpRight = (GGroup)comp.GetChild("grpRight");
             m_loaRight = (UI_Component7)UI_Component7.Create(comp.GetChild("loaRight"));
-            m_loaLeft = (UI_Component7)UI_Component7.Create(comp.GetChild("loaLeft"));
-            m_grpMove = (GGroup)comp.GetChild("grpMove");
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
             m_grpList = (GGroup)comp.GetChild("grpList");
+            m_grpLeft = (GGroup)comp.GetChild("grpLeft");
+            m_btn0 = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btn0"));
+            m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
+            m_btnStudio = (UI_ButtonModle2)UI_ButtonModle2.Create(comp.GetChild("btnStudio"));
+            m_btnTravel = (UI_ButtonModle3)UI_ButtonModle3.Create(comp.GetChild("btnTravel"));
+            m_btnPoem = (UI_ButtonModle5)UI_ButtonModle5.Create(comp.GetChild("btnPoem"));
+            m_btnField = (UI_ButtonModle4)UI_ButtonModle4.Create(comp.GetChild("btnField"));
+            m_loaLeft = (UI_Component7)UI_Component7.Create(comp.GetChild("loaLeft"));
+            m_grpRight = (GGroup)comp.GetChild("grpRight");
+            m_grpMove = (GGroup)comp.GetChild("grpMove");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
+            m_t3 = comp.GetTransition("t3");
             m_t4 = comp.GetTransition("t4");
-            m_t11 = comp.GetTransition("t11");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_valueBar = null;
             m_headBar.Dispose();
             m_headBar = null;
             m_btnDailyLogin.Dispose();
@@ -121,31 +126,34 @@ namespace UI.Main
             m_btnCiPai = null;
             m_btnZhaiXing.Dispose();
             m_btnZhaiXing = null;
+            m_loaRight.Dispose();
+            m_loaRight = null;
+            m_list = null;
+            m_btnChange.Dispose();
+            m_btnChange = null;
+            m_grpList = null;
             m_grpLeft = null;
+            m_btn0.Dispose();
+            m_btn0 = null;
+            m_btn1.Dispose();
+            m_btn1 = null;
             m_btnStudio.Dispose();
             m_btnStudio = null;
-            m_btnField.Dispose();
-            m_btnField = null;
-            m_btnPoem.Dispose();
-            m_btnPoem = null;
             m_btnTravel.Dispose();
             m_btnTravel = null;
-            m_grpRight = null;
-            m_loaRight.Dispose();
-            m_loaRight = null;
+            m_btnPoem.Dispose();
+            m_btnPoem = null;
+            m_btnField.Dispose();
+            m_btnField = null;
             m_loaLeft.Dispose();
             m_loaLeft = null;
+            m_grpRight = null;
             m_grpMove = null;
-            m_valueBar = null;
-            m_list = null;
-            m_btnChange.Dispose();
-            m_btnChange = null;
-            m_grpList = null;
             m_loaGuidestudio = null;
             m_t1 = null;
             m_t2 = null;
+            m_t3 = null;
             m_t4 = null;
-            m_t11 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 24 - 26
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -256,17 +256,22 @@ namespace GFGGame
         private void SetPos()
         {
             GameObject role = _sceneObject.transform.Find("Role").gameObject;
+            GameObject Bg = _sceneObject.transform.Find("Bg").gameObject;
+            GameObject Bg1 = _sceneObject.transform.Find("Bg1").gameObject;
             if (MainDataManager.Instance.ViewType == 0)
             {
                 role.SetActive(true);
-                _ui.m_t11.Play();
-                _sceneObject.transform.position = Vector2.zero;
+                Bg.SetActive(true);
+                Bg1.SetActive(false);
+                _ui.m_t3.Play(); ;
             }
             else if (MainDataManager.Instance.ViewType == 1)
             {
                 role.SetActive(false);
+                Bg.SetActive(false);
+                Bg1.SetActive(true);
                 _ui.m_t4.Play();
-                _sceneObject.transform.position = new Vector2(-GRoot.inst.width / 100f, 0);
+                // _sceneObject.transform.position = new Vector2(-GRoot.inst.width / 100f, 0);
             }
         }
         private void OnSwipe(EventContext context)
@@ -288,44 +293,37 @@ namespace GFGGame
         {
             _ui.target.touchable = false;
             TryCompleteGuide();
-            GameObject role = _sceneObject.transform.Find("Role").gameObject;
-
-            GTween.To(0, -GRoot.inst.width / 100f, 1f)
-            .SetTarget(_sceneObject)
-            .OnUpdate((GTweener t) =>
-            {
-                _sceneObject.transform.position = new Vector2(t.value.x, 0);
-                if (t.value.x < -5.4f) role.SetActive(false);
-            })
-            .SetEase(EaseType.CircInOut);
 
+            Timers.inst.Add(0.5f, 1, ChangeSceneBg);
             _ui.m_t1.Play(() =>
             {
                 _ui.target.touchable = true;
                 MainDataManager.Instance.ViewType = 1;
             });
         }
+        private void ChangeSceneBg(object param)
+        {
+            _sceneObject.transform.Find("Role").gameObject.SetActive(false);
+            _sceneObject.transform.Find("Bg").gameObject.SetActive(false);
+            _sceneObject.transform.Find("Bg1").gameObject.SetActive(true);
+        }
         private void MoveRight()
         {
 
             _ui.target.touchable = false;
-            GameObject role = _sceneObject.transform.Find("Role").gameObject;
-
-            GTween.To(-GRoot.inst.width / 100f, 0f, 1f)
-           .SetTarget(_sceneObject)
-           .OnUpdate((GTweener t) =>
-           {
-               _sceneObject.transform.position = new Vector2(t.value.x, 0);
-               if (t.value.x > -5.4f) role.SetActive(true);
-
-           })
-           .SetEase(EaseType.CircInOut);
+            Timers.inst.Add(0.5f, 1, ChangeSceneBg1);
             _ui.m_t2.Play(() =>
             {
                 _ui.target.touchable = true;
                 MainDataManager.Instance.ViewType = 0;
             });
         }
+        private void ChangeSceneBg1(object param)
+        {
+            _sceneObject.transform.Find("Role").gameObject.SetActive(true);
+            _sceneObject.transform.Find("Bg").gameObject.SetActive(true);
+            _sceneObject.transform.Find("Bg1").gameObject.SetActive(false);
+        }
         private void OnBtnChangClick()
         {
             int count = 0;
@@ -365,10 +363,10 @@ namespace GFGGame
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
             if (isOpen) return;
             isOpen = true;
-            _ui.m_btnMain.m_holder1.visible = true;
+            // _ui.m_btnMain.m_holder1.visible = true;
             // Timers.inst.Add(effectTime, 1, (param) =>
             // {
-            _ui.m_btnMain.m_holder1.visible = false;
+            // _ui.m_btnMain.m_holder1.visible = false;
             // this.Hide();
             ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             isOpen = false; ;

+ 1 - 1
GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -79,7 +79,7 @@ namespace GFGGame
         {
             var result = JsonMapper.ToObject<Result>(json);
             LauncherConfig.CDN_ROOT = result.cdnRoot;
-            CDN_ROOT = "http://10.108.64.127/";
+            //CDN_ROOT = "http://10.108.64.127/";
             LauncherConfig.logApiRootUrl = result.logApiUrl;
             //LauncherConfig.logApiRootUrl = "http://10.108.64.106:8080/api/Log/";
             LauncherConfig.logApiReportLauncherUrl = LauncherConfig.logApiRootUrl + "ReportNode";

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


+ 2 - 85
GameClient/Assets/ResIn/Prefab/SceneMain.prefab

@@ -25,7 +25,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 846544056943548434}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 10.8, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8934048990737965464}
@@ -164,88 +164,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!1 &6659084238600538392
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3733622001744196029}
-  - component: {fileID: 4719268146684206238}
-  m_Layer: 0
-  m_Name: Bg2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3733622001744196029
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6659084238600538392}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 5.29, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 8934048990737965464}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &4719268146684206238
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6659084238600538392}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 6a770f0b515623c41967037cbd2dcc12, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 2.625, y: 24}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!1 &8934048990737965465
 GameObject:
   m_ObjectHideFlags: 0
@@ -275,7 +193,6 @@ Transform:
   m_Children:
   - {fileID: 2432797848204161373}
   - {fileID: 2397053893390390833}
-  - {fileID: 3733622001744196029}
   - {fileID: 3768987550495608174}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -289,7 +206,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x

BIN=BIN
GameClient/Assets/ResIn/UI/Bag/Bag_atlas0!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Bag/Bag_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: c6ec36ea1e1a78c479bdf92823829187
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/Bag/Bag_atlas0.png


BIN=BIN
GameClient/Assets/ResIn/UI/Bag/Bag_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: c809e71d29fce7346b74e4669db820f5
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0.png


BIN=BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 4d42a66d5b243b74ab2ba8586d00ad64
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_1.png


BIN=BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_2!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Card/Card_atlas0_2!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 5a585a076438ba44aafd44a8f9619527
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_2.png


BIN=BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 97ce08151075a5444b00f7ec31f78cbc
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0.png


BIN=BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 410c4bb8f24f6df42af95b1dd94c8a81
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0.png


BIN=BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: ec694de4188237940862c8af56cc7e9f
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1.png


BIN=BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 0a34e672f663e654791f6a6c997f2b25
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png


+ 39 - 3
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png.meta

@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -75,6 +75,42 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: []

BIN=BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 04d1564f1779bc34f827189405d49132
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62.png


BIN=BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 762acfdcffd31524aa3f65e01d35aac5
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/CreateRole/CreateRole_atlas0.png


BIN=BIN
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: e280600e30dd8764391564e27648a81e
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0.png


BIN=BIN
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: aa974b18598f5484ca1561efe833015a
+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: 0
+    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=BIN
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1.png


BIN=BIN
GameClient/Assets/ResIn/UI/DailyTask/DailyTask_atlas0!a.png


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio