فهرست منبع

修复自选礼包BUG,调整随机礼包界面

何晓捷 2 سال پیش
والد
کامیت
4981ffd29d

+ 12 - 9
FGUIProject/assets/Bag/GiftBoxSelectorUI.xml

@@ -3,15 +3,18 @@
   <displayList>
     <image id="n0_v5no" name="n0" src="v5notm5" fileName="images/tanchuang_2.png" xy="-61,-37" size="1023,1026"/>
     <component id="n31_cu9w" name="btnCancel" src="cu9wtmj" fileName="components/BtnCancel.xml" xy="849,-29" group="n11_v5no"/>
-    <image id="n14_v5no" name="n14" src="v5notm0" fileName="images/lm_db_3.png" xy="331,135" size="575,274" group="n11_v5no"/>
-    <image id="n1_v5no" name="n1" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="243,72" group="n11_v5no"/>
-    <image id="n2_v5no" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="587,71" pivot="0.5,0" group="n11_v5no" scale="-1,1"/>
-    <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="-9,76" group="n11_v5no"/>
-    <text id="n15_v5no" name="txtItemDes" xy="390,165" size="462,217" group="n11_v5no" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
-    <text id="n3_v5no" name="txtName" xy="376,53" size="210,54" group="n11_v5no" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoSize="shrink" text="稀有升星材料(自选)"/>
-    <text id="n5_v5no" name="txtTotalNum" xy="725,86" size="206,41" group="n11_v5no" fontSize="28" color="#b08d5c" align="center" leading="1" autoSize="shrink" text="已拥有:1940"/>
-    <loader id="n7_v5no" name="loaIcon" xy="171,252" pivot="0.5,0.5" anchor="true" size="164,164" group="n11_v5no" aspect="true" autoSize="true"/>
-    <group id="n11_v5no" name="n11" xy="-9,-29" size="946,456"/>
+    <image id="n14_v5no" name="n14" src="v5notm0" fileName="images/lm_db_3.png" xy="331,138" size="575,274" group="n11_v5no"/>
+    <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="-9,79" group="n11_v5no"/>
+    <text id="n15_v5no" name="txtItemDes" xy="390,168" size="462,217" group="n11_v5no" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
+    <text id="n5_v5no" name="txtTotalNum" xy="725,89" size="206,41" group="n11_v5no" fontSize="28" color="#b08d5c" align="center" leading="1" autoSize="shrink" text="已拥有:1940"/>
+    <loader id="n7_v5no" name="loaIcon" xy="171,255" pivot="0.5,0.5" anchor="true" size="164,164" group="n11_v5no" aspect="true" autoSize="true"/>
+    <image id="n1_v5no" name="n1" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="130,69" pivot="0.5,0.5" group="n33_x8jz"/>
+    <text id="n3_v5no" name="txtName" xy="279,51" pivot="0.5,0" size="404,54" group="n33_x8jz" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoClearText="true" text="稀有升星稀星稀星稀星"/>
+    <image id="n2_v5no" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="702,71" pivot="0.5,0.5" group="n33_x8jz" scale="-1,1"/>
+    <group id="n33_x8jz" name="n33" xy="130,51" size="702,54" group="n11_v5no" advanced="true" layout="hz" colGap="19" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <group id="n11_v5no" name="n11" xy="-9,-29" size="946,459"/>
     <image id="n18_v5no" name="n18" src="v5notm4" fileName="images/lm_zsx0.png" xy="117,423" group="n21_v5no"/>
     <text id="n19_v5no" name="n19" xy="378,422" size="206,44" group="n21_v5no" fontSize="32" color="#b69566" align="center" leading="1" autoSize="none" text="自选道具"/>
     <list id="n20_v5no" name="list" xy="43,494" size="875,241" group="n21_v5no" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="20" defaultItem="ui://2bsz6nelv5notmb" align="center">

+ 33 - 31
FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -2,19 +2,21 @@
 <component size="962,1116">
   <displayList>
     <image id="n37_qdaz" name="n37" src="qdaztno" fileName="images/tanchuang_2.png" xy="-59,-31" size="1021,1169"/>
-    <image id="n41_x8jz" name="n41" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="223,128" size="123,18" group="n12_si5z"/>
-    <image id="n42_x8jz" name="n42" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="690,145" size="119,17" group="n12_si5z" rotation="180"/>
-    <text id="n5_si5z" name="txtName" xy="347,109" size="222,54" group="n12_si5z" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoSize="shrink" autoClearText="true" text="物品名字物品名字"/>
-    <text id="n6_si5z" name="txtOwned" xy="750,117" pivot="1,0" size="131,42" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
-    <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,167" group="n12_si5z"/>
-    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="-11,136" size="346,336" group="n12_si5z" aspect="true"/>
-    <loader id="n8_si5z" name="loaRarity" xy="42,205" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <loader id="n9_si5z" name="loaIcon" xy="163,303" 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,204" size="543,204" group="n12_si5z"/>
-    <text id="n11_si5z" name="txtDesc" xy="375,226" 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,361" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
-    <group id="n12_si5z" name="n12" xy="-11,109" size="917,363" group="n33_l500" advanced="true"/>
-    <list id="n32_l500" name="listItem" xy="205,492" 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">
+    <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">
       <item/>
       <item/>
       <item/>
@@ -23,31 +25,31 @@
       <item/>
       <item/>
     </list>
-    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,665" size="897,15" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="359,643" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
-    <group id="n4_si5z" name="n4" xy="32,643" size="897,54" group="n34_l500"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,720" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,718" group="n19_si5z">
+    <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">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,719" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,717" group="n19_si5z">
+    <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">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="343,725" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="175,717" size="612,70" group="n34_l500"/>
-    <text id="n24_si5z" name="txtTips" xy="317,807" 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,898" 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,889" 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,807" 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,964" group="n20_si5z">
+    <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">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,964" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,948" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="124,964" size="714,89" group="n34_l500"/>
-    <group id="n34_l500" name="n34" xy="32,643" size="897,410" group="n33_l500" advanced="true"/>
-    <group id="n33_l500" name="n33" xy="-11,109" size="940,944" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <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"/>
   </displayList>
 </component>

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_GiftBoxSelectorUI.cs

@@ -9,9 +9,9 @@ namespace UI.Bag
         public GComponent target;
         public GButton m_btnCancel;
         public GTextField m_txtItemDes;
-        public GTextField m_txtName;
         public GTextField m_txtTotalNum;
         public GLoader m_loaIcon;
+        public GTextField m_txtName;
         public GList m_list;
         public GTextField m_txtSelRewardStr;
         public GButton m_btnSub;
@@ -64,9 +64,9 @@ namespace UI.Bag
         {
             m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_txtItemDes = (GTextField)comp.GetChild("txtItemDes");
-            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtTotalNum = (GTextField)comp.GetChild("txtTotalNum");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
             m_list = (GList)comp.GetChild("list");
             m_txtSelRewardStr = (GTextField)comp.GetChild("txtSelRewardStr");
             m_btnSub = (GButton)comp.GetChild("btnSub");
@@ -75,9 +75,9 @@ namespace UI.Bag
         {
             m_btnCancel = null;
             m_txtItemDes = null;
-            m_txtName = null;
             m_txtTotalNum = null;
             m_loaIcon = null;
+            m_txtName = null;
             m_list = null;
             m_txtSelRewardStr = null;
             m_btnSub = null;

+ 3 - 3
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_txtName;
         public GTextField m_txtOwned;
         public GLoader m_loaRarity;
         public GLoader m_loaIcon;
         public GTextField m_txtDesc;
         public GTextField m_txtExchangeCount;
+        public GTextField m_txtName;
         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_txtName = (GTextField)comp.GetChild("txtName");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             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_listItem = (GList)comp.GetChild("listItem");
             m_txtShow = (GTextField)comp.GetChild("txtShow");
             m_btnMinus = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMinus"));
@@ -91,12 +91,12 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtName = null;
             m_txtOwned = null;
             m_loaRarity = null;
             m_loaIcon = null;
             m_txtDesc = null;
             m_txtExchangeCount = null;
+            m_txtName = null;
             m_listItem = null;
             m_txtShow = null;
             m_btnMinus.Dispose();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Bag/GiftBoxSelectorView.cs

@@ -140,7 +140,7 @@ namespace GFGGame
                 longPressGesture2.interval = 0.1f;
                 longPressGesture2.once = false;
                 longPressGesture2.onAction.Add(OnLongPressReduce);
-                _listLongPress.Add(longPressGesture);
+                _listLongPress.Add(longPressGesture2);
             }
 
             uiItemChild.target.data = itemCfgChild;

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


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