Browse Source

左侧为已拥有的数量,右侧为要消耗的数量

zhaoyang 3 years ago
parent
commit
a7528e50a4

+ 7 - 8
FGUIProject/assets/Card/components/ComStarConsume.xml

@@ -6,13 +6,12 @@
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     </loader>
     <image id="n33_842s" name="n33" src="842s6f" fileName="images/kp_dikuang_4.png" xy="20,146" size="135,30"/>
     <image id="n33_842s" name="n33" src="842s6f" fileName="images/kp_dikuang_4.png" xy="20,146" size="135,30"/>
-    <text id="n38_a713" name="txtNeedCount" xy="49,144" pivot="1,0" size="34,34" fontSize="24" color="#fdf3d7" ubb="true" text="66">
-      <relation target="n41_wr9a" sidePair="right-left,top-top"/>
-    </text>
-    <text id="n39_a713" name="txtHasCount" xy="89,144" size="34,34" fontSize="24" color="#fdf3d7" text="12">
-      <relation target="n41_wr9a" sidePair="left-right,top-top"/>
-    </text>
-    <text id="n41_wr9a" name="n41" xy="75,144" size="18,34" fontSize="24" color="#fff8ea" text="/"/>
-    <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" xy="124,136" pkg="eg2y0ldp"/>
+    <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" pkg="eg2y0ldp" xy="124,136"/>
+    <text id="n39_a713" name="txtHasCount" xy="46,144" size="34,34" group="n42_94m1" fontSize="24" color="#fdf3d7" text="12"/>
+    <text id="n41_wr9a" name="n41" xy="76,144" size="18,34" group="n42_94m1" fontSize="24" color="#fff8ea" text="/"/>
+    <text id="n38_a713" name="txtNeedCount" xy="90,144" size="34,34" group="n42_94m1" fontSize="24" color="#fdf3d7" ubb="true" text="66"/>
+    <group id="n42_94m1" name="n42" xy="46,144" size="78,34" advanced="true" layout="hz" colGap="-4" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
   </displayList>
 </component>
 </component>

+ 4 - 4
FGUIProject/assets/ClothingFoster/components/ListMaterialsItem.xml

@@ -4,12 +4,12 @@
     <image id="n9_bd1c" name="n9" src="bd1c1n" fileName="images/fzyc_hxk_2.png" xy="0,0"/>
     <image id="n9_bd1c" name="n9" src="bd1c1n" fileName="images/fzyc_hxk_2.png" xy="0,0"/>
     <loader id="n5_py5g" name="loaIcon" xy="21,21" size="150,150" aspect="true" url="ui://uicwtr5bpy5ge" fill="scale"/>
     <loader id="n5_py5g" name="loaIcon" xy="21,21" size="150,150" aspect="true" url="ui://uicwtr5bpy5ge" fill="scale"/>
     <image id="n11_l4ui" name="n11" src="bd1c1o" fileName="images/fzyc_hxk_3.png" xy="29,158"/>
     <image id="n11_l4ui" name="n11" src="bd1c1o" fileName="images/fzyc_hxk_3.png" xy="29,158"/>
-    <text id="n7_py5g" name="txtNeed" xy="57,157" pivot="1,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" align="right" ubb="true" text="10">
-      <relation target="n8_nk8d" sidePair="right-left,top-top"/>
+    <text id="n6_py5g" name="txtHas" xy="57,158" pivot="0,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" ubb="true" text="11">
+      <relation target="n8_nk8d" sidePair="left-right,top-top"/>
     </text>
     </text>
     <text id="n8_nk8d" name="n8" xy="91,158" pivot="0.5,0.5" size="18,34" group="n10_l4ui" fontSize="24" color="#fff8ea" ubb="true" text="/"/>
     <text id="n8_nk8d" name="n8" xy="91,158" pivot="0.5,0.5" size="18,34" group="n10_l4ui" fontSize="24" color="#fff8ea" ubb="true" text="/"/>
-    <text id="n6_py5g" name="txtHas" xy="109,158" pivot="0,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" ubb="true" text="11">
-      <relation target="n8_nk8d" sidePair="left-right,top-top"/>
+    <text id="n7_py5g" name="txtNeed" xy="109,157" pivot="1,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" align="right" ubb="true" text="10">
+      <relation target="n8_nk8d" sidePair="right-left,top-top"/>
     </text>
     </text>
     <group id="n10_l4ui" name="n10" xy="57,157" size="86,35" advanced="true" layout="hz" excludeInvisibles="true">
     <group id="n10_l4ui" name="n10" xy="57,157" size="86,35" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComStarConsume.cs

@@ -8,9 +8,9 @@ namespace UI.Card
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaItem;
         public GLoader m_loaItem;
-        public GTextField m_txtNeedCount;
-        public GTextField m_txtHasCount;
         public GButton m_btnPlus;
         public GButton m_btnPlus;
+        public GTextField m_txtHasCount;
+        public GTextField m_txtNeedCount;
         public const string URL = "ui://7l6lvkaywr9a82";
         public const string URL = "ui://7l6lvkaywr9a82";
         public const string PACKAGE_NAME = "Card";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ComStarConsume";
         public const string RES_NAME = "ComStarConsume";
@@ -59,16 +59,16 @@ namespace UI.Card
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaItem = (GLoader)comp.GetChild("loaItem");
             m_loaItem = (GLoader)comp.GetChild("loaItem");
-            m_txtNeedCount = (GTextField)comp.GetChild("txtNeedCount");
-            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_btnPlus = (GButton)comp.GetChild("btnPlus");
             m_btnPlus = (GButton)comp.GetChild("btnPlus");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_txtNeedCount = (GTextField)comp.GetChild("txtNeedCount");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaItem = null;
             m_loaItem = null;
-            m_txtNeedCount = null;
-            m_txtHasCount = null;
             m_btnPlus = null;
             m_btnPlus = null;
+            m_txtHasCount = null;
+            m_txtNeedCount = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListMaterialsItem.cs

@@ -8,8 +8,8 @@ namespace UI.ClothingFoster
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaIcon;
         public GLoader m_loaIcon;
-        public GTextField m_txtNeed;
         public GTextField m_txtHas;
         public GTextField m_txtHas;
+        public GTextField m_txtNeed;
         public const string URL = "ui://uicwtr5bpy5gu";
         public const string URL = "ui://uicwtr5bpy5gu";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "ListMaterialsItem";
         public const string RES_NAME = "ListMaterialsItem";
@@ -58,14 +58,14 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
             m_txtHas = (GTextField)comp.GetChild("txtHas");
             m_txtHas = (GTextField)comp.GetChild("txtHas");
+            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaIcon = null;
             m_loaIcon = null;
-            m_txtNeed = null;
             m_txtHas = null;
             m_txtHas = null;
+            m_txtNeed = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

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


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