zhaoyang 2 éve
szülő
commit
35cefca4c8
21 módosított fájl, 110 hozzáadás és 109 törlés
  1. 12 12
      FGUIProject/assets/ClothingShop/components/ComClothingShopItemInfo.xml
  2. 8 7
      FGUIProject/assets/CommonGame/GoodsItemTips.xml
  3. 30 35
      FGUIProject/assets/CommonGame/ItemExchangeUI.xml
  4. 6 6
      FGUIProject/assets/CommonGame/components/ComTipsApproach.xml
  5. 22 21
      FGUIProject/assets/CommonGame/components/ComTipsBase.xml
  6. 1 1
      FGUIProject/assets/CommonGame/components/ListTagItem.xml
  7. 4 2
      FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml
  8. 1 1
      FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml
  9. 3 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs
  10. 3 2
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GoodsItemTips.cs
  11. 10 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs
  12. 4 3
      GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs
  13. 3 2
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs
  14. 3 2
      GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs
  15. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  17. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  19. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png
  21. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

+ 12 - 12
FGUIProject/assets/ClothingShop/components/ComClothingShopItemInfo.xml

@@ -8,17 +8,17 @@
   </controller>
   <displayList>
     <image id="n7_hinb" name="n7" src="hinb3" fileName="images/fzd_diban_1.png" xy="0,0"/>
-    <text id="n8_hinb" name="txtName" xy="57,41" size="323,62" fontSize="46" color="#b59158" text="衣服名字·名字"/>
+    <text id="n8_hinb" name="txtName" xy="57,41" size="323,61" fontSize="46" color="#b59158" text="衣服名字·名字"/>
     <text id="n30_hinb" name="txtDesc" xy="64,143" size="336,39" fontSize="28" color="#af9a7d" autoSize="height" autoClearText="true" text="赵钱孙李周吴郑王"/>
     <loader id="n43_hinb" name="rarity" xy="379,20" size="44,94" visible="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n32_hinb" name="txtOwned" xy="170,610" size="121,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有:[/color]{v1=0}"/>
+    <text id="n32_hinb" name="txtOwned" xy="170,610" size="119,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有:[/color]{v1=0}"/>
     <component id="n20_hinb" name="btnBuy" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="83,652">
       <Button title=" "/>
     </component>
     <loader id="n47_ugdz" name="iconPrice" xy="182,674" size="34,34" group="n46_hinb" touchable="false" url="ui://eg2y0ldpq08x3" fill="scale">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </loader>
-    <text id="n48_ugdz" name="txtPrice" xy="226,667" size="93,44" group="n46_hinb" fontSize="32" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" autoClearText="true" text="99999">
+    <text id="n48_ugdz" name="txtPrice" xy="226,667" size="82,44" group="n46_hinb" fontSize="32" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" autoClearText="true" text="99999">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </text>
     <text id="n45_hinb" name="txtBtnBuy" xy="182,662" size="76,49" group="n46_hinb" fontSize="36" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" text="购买">
@@ -35,14 +35,14 @@
     </list>
     <image id="n54_v95q" name="n54" src="9cth60" fileName="images/fzd_xiant_1.png" xy="43,117"/>
     <image id="n55_v95q" name="n55" src="v95qek" fileName="images/fzd_kuangdidi.png" xy="42,353"/>
-    <image id="n33_hinb" name="n33" src="842s6h" fileName="imagesExport/kp_sx_1.png" pkg="eg2y0ldp" xy="60,363" size="36,36" group="n56_v95q" aspect="true"/>
-    <image id="n34_hinb" name="n34" src="842s6i" fileName="imagesExport/kp_sx_2.png" pkg="eg2y0ldp" xy="228,363" size="36,36" group="n56_v95q" aspect="true"/>
-    <image id="n35_hinb" name="n35" src="842s6j" fileName="imagesExport/kp_sx_3.png" pkg="eg2y0ldp" xy="60,418" size="36,36" group="n56_v95q" aspect="true"/>
-    <image id="n36_hinb" name="n36" src="842s6k" fileName="imagesExport/kp_sx_4.png" pkg="eg2y0ldp" xy="228,418" size="36,36" group="n56_v95q" aspect="true"/>
-    <text id="n38_hinb" name="txtGong" xy="106,364" size="52,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n40_hinb" name="txtShang" xy="273,364" size="52,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n42_hinb" name="txtJue" xy="106,420" size="52,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n39_hinb" name="txtZhi" xy="273,420" size="52,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <group id="n56_v95q" name="n56" xy="60,363" size="267,91"/>
+    <image id="n33_hinb" name="n33" src="842s6h" fileName="imagesNew/kp_sx_1.png" pkg="eg2y0ldp" xy="78,384" pivot="0.5,0.5" anchor="true" size="40,40" group="n56_v95q" aspect="true"/>
+    <image id="n34_hinb" name="n34" src="842s6i" fileName="imagesNew/kp_sx_3.png" pkg="eg2y0ldp" xy="246,384" pivot="0.5,0.5" anchor="true" size="40,40" group="n56_v95q" aspect="true"/>
+    <image id="n35_hinb" name="n35" src="842s6j" fileName="imagesNew/kp_sx_2.png" pkg="eg2y0ldp" xy="78,439" pivot="0.5,0.5" anchor="true" size="40,40" group="n56_v95q" aspect="true"/>
+    <image id="n36_hinb" name="n36" src="842s6k" fileName="imagesNew/kp_sx_4.png" pkg="eg2y0ldp" xy="246,439" pivot="0.5,0.5" anchor="true" size="40,40" group="n56_v95q" aspect="true"/>
+    <text id="n38_hinb" name="txtGong" xy="106,362" pivot="0,0.5" size="61,42" group="n56_v95q" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n40_hinb" name="txtShang" xy="273,362" pivot="0,0.5" size="61,42" group="n56_v95q" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n42_hinb" name="txtJue" xy="106,418" pivot="0,0.5" size="61,42" group="n56_v95q" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n39_hinb" name="txtZhi" xy="273,418" pivot="0,0.5" size="61,42" group="n56_v95q" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <group id="n56_v95q" name="n56" xy="58,362" size="276,98"/>
   </displayList>
 </component>

+ 8 - 7
FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1310" opaque="false">
+<component size="1080,1333" opaque="false">
   <displayList>
-    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,1" size="962,1307">
-      <relation target="n17_ohbx" sidePair="height-height,middle-middle"/>
-    </component>
-    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,1" group="n17_ohbx"/>
-    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,715" size="962,596" group="n17_ohbx"/>
-    <group id="n17_ohbx" name="grpTips" xy="0,1" size="962,1310" advanced="true" layout="vt" excludeInvisibles="true">
+    <component id="n21_si5z" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1333">
       <relation target="" sidePair="middle-middle"/>
+      <relation target="n17_ohbx" sidePair="height-height"/>
+    </component>
+    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="59,132" group="n17_ohbx"/>
+    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="59,809" size="962,506" group="n17_ohbx"/>
+    <group id="n17_ohbx" name="grpTips" xy="59,132" size="962,1183" advanced="true" layout="vt" lineGap="15" excludeInvisibles="true">
+      <relation target="n21_si5z" sidePair="top-top"/>
     </group>
   </displayList>
 </component>

+ 30 - 35
FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1116">
+<component size="1080,1116">
   <displayList>
-    <image id="n37_qdaz" name="n37" src="qdaztno" fileName="images/tanchuang_2.png" xy="-59,-31" size="1021,1169"/>
-    <text id="n6_si5z" name="txtOwned" xy="750,124" pivot="1,0" size="131,42" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
-    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="-11,128" size="346,336" group="n12_si5z" aspect="true"/>
-    <loader id="n8_si5z" name="loaRarity" xy="42,197" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <loader id="n9_si5z" name="loaIcon" xy="163,295" pivot="0.5,0.5" anchor="true" size="180,180" group="n12_si5z" aspect="true" autoSize="true"/>
-    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="357,196" size="543,204" group="n12_si5z"/>
-    <text id="n11_si5z" name="txtDesc" xy="375,218" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="240,353" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
-    <image id="n41_x8jz" name="n41" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="177,90" pivot="0.5,0.5" size="123,18" group="n43_x8jz"/>
-    <text id="n5_si5z" name="txtName" xy="341,70" pivot="0.5,0" size="284,54" group="n43_x8jz" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoClearText="true" text="物品名字物品名"/>
-    <image id="n42_x8jz" name="n42" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="666,91" pivot="0.5,0.5" size="119,17" group="n43_x8jz" scale="-1,1"/>
-    <group id="n43_x8jz" name="n43" xy="177,70" size="608,54" group="n12_si5z" advanced="true" layout="hz" colGap="41" excludeInvisibles="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
-    <group id="n12_si5z" name="n12" xy="-11,70" size="911,394" group="n33_l500" advanced="true"/>
-    <list id="n32_l500" name="listItem" xy="205,484" pivot="0.5,0" size="569,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
+    <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1115"/>
+    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="77,124" size="346,336" group="n12_si5z" aspect="true"/>
+    <loader id="n8_si5z" name="loaRarity" xy="130,193" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <loader id="n9_si5z" name="loaIcon" xy="251,291" pivot="0.5,0.5" anchor="true" size="180,180" group="n12_si5z" aspect="true" autoSize="true"/>
+    <text id="n28_s5s9" name="txtExchangeCount" xy="328,349" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#8e7c6b" vars="true" text="x{count=20}"/>
+    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="403,192" size="575,230" group="n12_si5z"/>
+    <text id="n6_si5z" name="txtOwned" xy="840,146" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
+    <text id="n11_si5z" name="txtDesc" xy="439,214" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <group id="n12_si5z" name="n12" xy="77,124" size="901,336" group="n33_l500" advanced="true"/>
+    <list id="n32_l500" name="listItem" xy="110,480" pivot="0.5,0" size="859,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -25,31 +19,32 @@
       <item/>
       <item/>
     </list>
-    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,657" size="897,15" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="359,635" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
-    <group id="n4_si5z" name="n4" xy="32,635" size="897,54" group="n34_l500"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,712" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,710" group="n19_si5z">
+    <image id="n2_si5z" name="n2" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="176,657" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="435,649" pivot="0.5,0" size="210,48" group="n4_si5z" fontSize="35" color="#b69566" align="center" text="选择使用数量"/>
+    <graph id="n44_ofwu" name="n44" xy="530,631" size="20,20" group="n4_si5z"/>
+    <group id="n4_si5z" name="n4" xy="176,631" size="727,67" group="n34_l500"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="256,726" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="234,724" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,711" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,709" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="549,725" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="656,723" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="343,717" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="175,709" size="612,70" group="n34_l500"/>
-    <text id="n24_si5z" name="txtTips" xy="317,799" pivot="0.5,0" size="326,52" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具?"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="415,879" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
-    <text id="n36_l500" name="txtRmbCost" xy="450,881" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
-    <group id="n26_si5z" name="n26" xy="317,799" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
-    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,948" group="n20_si5z">
+    <text id="n22_si5z" name="txtCostCount" xy="402,731" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="234,723" size="612,70" group="n34_l500"/>
+    <text id="n24_si5z" name="txtTips" xy="377,813" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具?"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="474,893" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
+    <text id="n36_l500" name="txtRmbCost" xy="509,895" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
+    <group id="n26_si5z" name="n26" xy="376,813" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="183,962" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,948" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="603,962" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="124,948" size="714,89" group="n34_l500"/>
-    <group id="n34_l500" name="n34" xy="32,635" size="897,402" group="n33_l500" advanced="true"/>
-    <group id="n33_l500" name="n33" xy="-11,70" size="940,967" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <group id="n20_si5z" name="n20" xy="183,962" size="714,89" group="n34_l500"/>
+    <group id="n34_l500" name="n34" xy="176,631" size="727,420" group="n33_l500" advanced="true"/>
+    <group id="n33_l500" name="n33" xy="77,124" size="901,927" advanced="true"/>
   </displayList>
 </component>

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

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,615">
+<component size="962,488">
   <displayList>
-    <image id="n25_si5z" name="n25" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="68,22" group="n21_ohbx"/>
-    <text id="n20_ohbx" name="n20" xy="399,0" size="164,54" group="n21_ohbx" fontSize="40" color="#8a7253" text="获取途径"/>
-    <group id="n21_ohbx" name="n21" xy="68,0" size="825,54"/>
-    <list id="n18_ohbx" name="list" xy="47,80" size="867,486" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpohbxti7">
+    <image id="n25_si5z" name="n25" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="117,0" group="n21_ohbx" alpha="0.7"/>
+    <text id="n20_ohbx" name="n20" xy="410,0" size="142,48" group="n21_ohbx" fontSize="35" color="#b69566" text="获取途径"/>
+    <group id="n21_ohbx" name="n21" xy="117,0" size="727,48"/>
+    <list id="n18_ohbx" name="list" xy="47,62" size="867,404" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpohbxti7">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n24_ohbx" name="txtNone" xy="354,256" size="254,56" fontSize="42" color="#a49a86" text="暂无获取途径"/>
+    <text id="n24_ohbx" name="txtNone" xy="354,256" size="254,56" fontSize="42" color="#b69566" text="暂无获取途径"/>
   </displayList>
 </component>

+ 22 - 21
FGUIProject/assets/CommonGame/components/ComTipsBase.xml

@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,714">
+<component size="962,662">
   <displayList>
-    <text id="n1_s2cc" name="txtName" xy="65,50" size="186,61" group="n24_u2u3" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
-    <text id="n3_s2cc" name="txtOwned" xy="752,72" pivot="1,0" size="129,41" group="n24_u2u3" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
-    <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,122" group="n24_u2u3"/>
-    <loader id="n8_si5z" name="loaIcon" xy="187,270" pivot="0.5,0.5" anchor="true" size="200,200" group="n24_u2u3" aspect="true" autoSize="true"/>
-    <loader id="n6_ohbx" name="loaRarity" xy="249,156" size="44,94" group="n24_u2u3" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <image id="n20_r9ri" name="n20" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="354,162" group="n24_u2u3"/>
-    <text id="n9_si5z" name="txtDesc" xy="375,181" size="506,166" group="n24_u2u3" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <group id="n24_u2u3" name="n24" xy="56,50" size="850,320" group="n25_u2u3" advanced="true"/>
-    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,400" size="50,50" group="n19_si5z"/>
-    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="300,400" size="50,50" group="n19_si5z"/>
-    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="525,400" size="50,50" group="n19_si5z"/>
-    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,400" size="50,50" group="n19_si5z"/>
-    <text id="n15_si5z" name="txtGong" xy="135,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n16_si5z" name="txtShang" xy="360,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n17_si5z" name="txtJue" xy="585,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n18_si5z" name="txtZhi" xy="810,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <group id="n19_si5z" name="grpScore" xy="75,400" size="807,50" group="n25_u2u3" advanced="true"/>
-    <list id="n21_u2u3" name="listTag" xy="71,480" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
+    <image id="n27_ofwu" name="n27" src="x8jztnq" fileName="images/wplb_db.png" xy="0,0" group="n29_ofwu"/>
+    <loader id="n8_si5z" name="loaIcon" xy="183,175" pivot="0.5,0.5" anchor="true" size="200,200" group="n29_ofwu" aspect="true" autoSize="true"/>
+    <loader id="n6_ohbx" name="loaRarity" xy="246,65" size="44,94" group="n29_ofwu" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <group id="n29_ofwu" name="n29" xy="0,0" size="362,351" group="n24_u2u3"/>
+    <image id="n20_r9ri" name="n20" src="x8jztnr" fileName="images/lm_db_3.png" xy="350,49" size="575,274" group="n28_ofwu"/>
+    <text id="n3_s2cc" name="txtOwned" xy="792,6" pivot="1,0" size="122,39" group="n28_ofwu" fontSize="28" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
+    <text id="n9_si5z" name="txtDesc" xy="380,74" size="526,214" group="n28_ofwu" fontSize="32" color="#b08d5c" ubb="true" autoSize="none" autoClearText="true" text="手机课手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <group id="n28_ofwu" name="n28" xy="350,6" size="575,317" group="n24_u2u3"/>
+    <group id="n24_u2u3" name="n24" xy="0,0" size="925,351" group="n25_u2u3" advanced="true"/>
+    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,371" size="50,50" group="n19_si5z"/>
+    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="300,371" size="50,50" group="n19_si5z"/>
+    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="525,371" size="50,50" group="n19_si5z"/>
+    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,371" size="50,50" group="n19_si5z"/>
+    <text id="n15_si5z" name="txtGong" xy="135,375" size="61,41" group="n19_si5z" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n16_si5z" name="txtShang" xy="360,375" size="61,41" group="n19_si5z" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n17_si5z" name="txtJue" xy="585,375" size="61,41" group="n19_si5z" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n18_si5z" name="txtZhi" xy="810,375" size="61,41" group="n19_si5z" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <group id="n19_si5z" name="grpScore" xy="75,371" size="807,50" group="n25_u2u3" advanced="true"/>
+    <list id="n21_u2u3" name="listTag" xy="71,441" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
       <item/>
       <item/>
     </list>
-    <list id="n26_l500" name="listItem" xy="58,551" pivot="0.5,0" size="851,131" group="n25_u2u3" layout="row" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <list id="n26_l500" name="listItem" xy="58,502" pivot="0.5,0" size="851,131" group="n25_u2u3" layout="row" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
       <item/>
       <item/>
       <item/>
@@ -34,7 +35,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n25_u2u3" name="n25" xy="56,50" size="853,632" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <group id="n25_u2u3" name="n25" xy="0,0" size="925,633" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
   </displayList>
   <relation target="n25_u2u3" sidePair="height-height"/>
 </component>

+ 1 - 1
FGUIProject/assets/CommonGame/components/ListTagItem.xml

@@ -2,6 +2,6 @@
 <component size="182,41">
   <displayList>
     <component id="n22_u2u3" name="comTag" src="ih7566" fileName="components/ComTag.xml" xy="0,3"/>
-    <text id="n23_u2u3" name="txtTagScore" xy="110,0" size="72,41" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n23_u2u3" name="txtTagScore" xy="110,0" size="61,41" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
   </displayList>
 </component>

+ 4 - 2
FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,992"/>
-    <component id="n1_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" xy="897,16"/>
+    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,992">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <component id="n1_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" xy="903,25"/>
     <image id="n2_qik1" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
     <text id="n4_qik1" name="txtTitle" xy="380,92" pivot="0.5,0" size="348,54" group="n5_qik1" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" text="稀有升星材料(自选)"/>
     <image id="n3_qik1" name="n3" src="qik1tca" fileName="componentsBg/lm_dt_zsx2.png" xy="758,111" group="n5_qik1"/>

+ 1 - 1
FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml

@@ -4,7 +4,7 @@
     <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,989">
       <relation target="" sidePair="height-height"/>
     </image>
-    <component id="n1_qik1" name="btnClose" src="e050tob" fileName="componentsBg/Component2.xml" xy="896,17"/>
+    <component id="n1_qik1" name="btnClose" src="e050tob" fileName="componentsBg/Component2.xml" xy="903,24"/>
     <loader id="n6_mbf1" name="loaTitle" xy="264,94" pivot="0.5,0" size="560,34" url="ui://eg2y0ldpmbf1tn6" autoSize="true"/>
   </displayList>
   <customProperty target="loaTitle" propertyId="1"/>

+ 3 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs

@@ -7,10 +7,9 @@ namespace UI.CommonGame
     public partial class UI_ComTipsBase
     {
         public GComponent target;
-        public GTextField m_txtName;
-        public GTextField m_txtOwned;
         public GLoader m_loaIcon;
         public GLoader m_loaRarity;
+        public GTextField m_txtOwned;
         public GTextField m_txtDesc;
         public GTextField m_txtGong;
         public GTextField m_txtShang;
@@ -66,10 +65,9 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtGong = (GTextField)comp.GetChild("txtGong");
             m_txtShang = (GTextField)comp.GetChild("txtShang");
@@ -81,10 +79,9 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtName = null;
-            m_txtOwned = null;
             m_loaIcon = null;
             m_loaRarity = null;
+            m_txtOwned = null;
             m_txtDesc = null;
             m_txtGong = null;
             m_txtShang = null;

+ 3 - 2
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GoodsItemTips.cs

@@ -7,7 +7,7 @@ namespace UI.CommonGame
     public partial class UI_GoodsItemTips
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public UI_ComBg000 m_comBg;
         public UI_ComTipsBase m_comTipsBase;
         public UI_ComTipsApproach m_comTipsApproach;
         public GGroup m_grpTips;
@@ -58,13 +58,14 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_comBg = (UI_ComBg000)UI_ComBg000.Create(comp.GetChild("comBg"));
             m_comTipsBase = (UI_ComTipsBase)UI_ComTipsBase.Create(comp.GetChild("comTipsBase"));
             m_comTipsApproach = (UI_ComTipsApproach)UI_ComTipsApproach.Create(comp.GetChild("comTipsApproach"));
             m_grpTips = (GGroup)comp.GetChild("grpTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_comBg.Dispose();
             m_comBg = null;
             m_comTipsBase.Dispose();
             m_comTipsBase = null;

+ 10 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs

@@ -7,12 +7,12 @@ namespace UI.CommonGame
     public partial class UI_ItemExchangeUI
     {
         public GComponent target;
-        public GTextField m_txtOwned;
+        public UI_ComBg000 m_comBg;
         public GLoader m_loaRarity;
         public GLoader m_loaIcon;
-        public GTextField m_txtDesc;
         public GTextField m_txtExchangeCount;
-        public GTextField m_txtName;
+        public GTextField m_txtOwned;
+        public GTextField m_txtDesc;
         public GList m_listItem;
         public GTextField m_txtShow;
         public UI_Button2 m_btnMinus;
@@ -71,12 +71,12 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_comBg = (UI_ComBg000)UI_ComBg000.Create(comp.GetChild("comBg"));
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtExchangeCount = (GTextField)comp.GetChild("txtExchangeCount");
-            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_listItem = (GList)comp.GetChild("listItem");
             m_txtShow = (GTextField)comp.GetChild("txtShow");
             m_btnMinus = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMinus"));
@@ -91,12 +91,13 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtOwned = null;
+            m_comBg.Dispose();
+            m_comBg = null;
             m_loaRarity = null;
             m_loaIcon = null;
-            m_txtDesc = null;
             m_txtExchangeCount = null;
-            m_txtName = null;
+            m_txtOwned = null;
+            m_txtDesc = null;
             m_listItem = null;
             m_txtShow = null;
             m_btnMinus.Dispose();

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs

@@ -44,6 +44,7 @@ namespace GFGGame
             _ui.m_btnConfirm.onClick.Add(OnBtnConfirmClick);
             _ui.m_btnCancle.onClick.Add(OnBtnCancleClick);
             _ui.m_listItem.itemRenderer = ListItemRenderer;
+            _ui.m_comBg.m_btnClose.onClick.Add(Hide);
         }
 
         protected override void AddEventListener()
@@ -76,12 +77,12 @@ namespace GFGGame
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
 
-            _ui.m_txtName.text = itemCfg.name;
+            _ui.m_comBg.m_txtTitle.text = itemCfg.name;
             _ui.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
             _ui.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
             _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             _ui.m_txtRmbCost.visible = false;
-            
+
             UpdateThItemList(itemCfg);
             _ui.m_listItem.numItems = _itemList.Count; //itemCfg.itemsArr.Length;
             _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.USEABLE &&
@@ -201,7 +202,7 @@ namespace GFGGame
             {
                 ItemProxy.ReqUseItem(_itemId, _count).Coroutine();
             }
-            
+
             this.Hide();
         }
 

+ 3 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -39,6 +39,7 @@ namespace GFGGame
 
             _ui.m_comTipsBase.m_listTag.itemRenderer = RenderListTagItem;
             _ui.m_comTipsBase.m_listItem.itemRenderer = ListItemRenderer;
+            _ui.m_comBg.m_btnClose.onClick.Add(Hide);
         }
         protected override void AddEventListener()
         {
@@ -80,11 +81,11 @@ namespace GFGGame
         {
             if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
             {
-                _ui.m_comTipsBase.m_txtName.text = string.Format("{0}  _{1}", itemCfg.name, itemCfg.id);
+                _ui.m_comBg.m_txtTitle.text = string.Format("{0}  _{1}", itemCfg.name, itemCfg.id);
             }
             else
             {
-                _ui.m_comTipsBase.m_txtName.text = itemCfg.name;
+                _ui.m_comBg.m_txtTitle.text = itemCfg.name;
             }
             _ui.m_comTipsBase.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
             _ui.m_comTipsBase.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;

+ 3 - 2
GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs

@@ -41,7 +41,8 @@ namespace GFGGame
             _ui.m_btnMinus.target.onClick.Add(OnBtnMinusClick);
             _ui.m_btnMax.target.onClick.Add(OnBtnAllClick);
             _ui.m_btnConfirm.onClick.Add(OnBtnExchangeClick);
-            _ui.m_btnCancle.onClick.Add(this.Hide);
+            _ui.m_btnCancle.onClick.Add(Hide);
+            _ui.m_comBg.m_btnClose.onClick.Add(Hide);
 
             _ui.m_listItem.itemRenderer = ListItemRenderer;
         }
@@ -83,7 +84,7 @@ namespace GFGGame
         private void UpdateStaticView()
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_shopCfg.itemId);
-            _ui.m_txtName.text = itemCfg.name;
+            _ui.m_comBg.m_txtTitle.text = itemCfg.name;
             _ui.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
             _ui.m_txtOwned.SetVar("count", ItemDataManager.GetItemNum(_shopCfg.itemId).ToString()).FlushVars();
             _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png


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