Эх сурвалжийг харах

背包打开自选礼包加入改一下条件

何晓捷 2 жил өмнө
parent
commit
b3c3d78551

+ 50 - 16
FGUIProject/assets/EnduringGiftBox/RushSaleGiftBoxUI.xml

@@ -1,24 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,958">
 <component size="1080,958">
   <displayList>
   <displayList>
-    <image id="n1_yjmk" name="n1" src="yjmk2j" fileName="images/xsqg_db.png" xy="1,-72"/>
-    <image id="n0_yjmk" name="n0" src="yjmk2l" fileName="images/xsqg_lihui.png" xy="44,23"/>
-    <image id="n2_yjmk" name="n2" src="yjmk2i" fileName="images/wz_xsqg.png" xy="335,26"/>
-    <image id="n5_yjmk" name="n5" src="yjmk2m" fileName="images/xsqg_nr_db.png" xy="193,215"/>
-    <text id="n4_yjmk" name="txtBoxItemName" xy="363,207" size="283,65" fontSize="40" color="#fffbf5" align="center" autoSize="none" strokeColor="#d69546" text="体力限时礼包"/>
-    <image id="n6_yjmk" name="n6" src="yjmk2n" fileName="images/xsqg_sj_db.png" xy="639,216"/>
-    <text id="n8_yjmk" name="txtBoxResidueTime" xy="683,214" size="207,48" fontSize="35" color="#fffbf5" align="center" autoSize="none" text="6天23分23秒"/>
-    <list id="n11_yjmk" name="list" xy="344,377" size="425,203" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="50" defaultItem="ui://bdi1qe15yjmk2p" align="center">
+    <image id="n1_yjmk" name="n1" src="yjmk2j" fileName="images/xsqg_db.png" xy="1,-72" group="n22_droi"/>
+    <image id="n0_yjmk" name="n0" src="yjmk2l" fileName="images/xsqg_lihui.png" xy="44,23" group="n22_droi"/>
+    <image id="n2_yjmk" name="n2" src="yjmk2i" fileName="images/wz_xsqg.png" xy="335,26" group="n22_droi"/>
+    <component id="n19_droi" name="btnUp" src="droi3c" fileName="components/BtnUp.xml" xy="63,380" group="n22_droi"/>
+    <component id="n20_droi" name="btnNext" src="droi3d" fileName="components/BtnNext.xml" xy="877,386" group="n22_droi"/>
+    <component id="n21_droi" name="btnBack" src="qqhz26" fileName="components/BnBack.xml" xy="498,940" group="n22_droi"/>
+    <group id="n22_droi" name="n22" xy="1,-72" size="1077,1231"/>
+    <image id="n5_yjmk" name="n5" src="yjmk2m" fileName="images/xsqg_nr_db.png" xy="193,215" group="n23_droi"/>
+    <text id="n4_yjmk" name="txtBoxItemName" xy="363,207" size="283,65" group="n23_droi" fontSize="40" color="#fffbf5" align="center" autoSize="none" strokeColor="#d69546" text="体力限时礼包"/>
+    <image id="n6_yjmk" name="n6" src="yjmk2n" fileName="images/xsqg_sj_db.png" xy="639,216" group="n23_droi"/>
+    <text id="n8_yjmk" name="txtBoxResidueTime" xy="683,214" size="207,48" group="n23_droi" fontSize="35" color="#fffbf5" align="center" autoSize="none" text="6天23分23秒"/>
+    <list id="n11_yjmk" name="list" xy="344,377" size="425,203" group="n23_droi" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="50" defaultItem="ui://bdi1qe15yjmk2p" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <image id="n12_yjmk" name="n12" src="yjmk2b" fileName="images/xsqg_zsx.png" xy="302,602"/>
-    <text id="n13_yjmk" name="txtUrc" xy="453,623" size="224,68" fontSize="34" color="#b8857b" align="center" vAlign="middle" autoSize="shrink" text="今日限购0/1"/>
-    <component id="n15_yjmk" name="btnBuyPink" src="yjmk2q" fileName="components/BtnBuyPink.xml" xy="408,693"/>
-    <component id="n14_yjmk" name="comDiscount" src="yjmk2r" fileName="components/ComDiscount2.xml" xy="333,642"/>
-    <text id="n16_yjmk" name="txtLrc" xy="379,787" size="380,46" fontSize="34" color="#b8857b" align="center" autoSize="shrink" text="可获得60充值经验"/>
-    <component id="n19_droi" name="btnUp" src="droi3c" fileName="components/BtnUp.xml" xy="63,380"/>
-    <component id="n20_droi" name="btnNext" src="droi3d" fileName="components/BtnNext.xml" xy="877,386"/>
-    <component id="n21_droi" name="btnBack" src="qqhz26" fileName="components/BnBack.xml" xy="498,940"/>
+    <image id="n12_yjmk" name="n12" src="yjmk2b" fileName="images/xsqg_zsx.png" xy="302,602" group="n23_droi"/>
+    <text id="n13_yjmk" name="txtUrc" xy="453,623" size="224,68" group="n23_droi" fontSize="34" color="#b8857b" align="center" vAlign="middle" autoSize="shrink" text="今日限购0/1"/>
+    <component id="n15_yjmk" name="btnBuyPink" src="yjmk2q" fileName="components/BtnBuyPink.xml" xy="408,693" group="n23_droi"/>
+    <component id="n14_yjmk" name="comDiscount" src="yjmk2r" fileName="components/ComDiscount2.xml" xy="333,642" group="n23_droi"/>
+    <text id="n16_yjmk" name="txtLrc" xy="379,787" size="380,46" group="n23_droi" fontSize="34" color="#b8857b" align="center" autoSize="shrink" text="可获得60充值经验"/>
+    <group id="n23_droi" name="n23" xy="193,207" size="746,626"/>
   </displayList>
   </displayList>
+  <transition name="t3">
+    <item time="0" type="Alpha" target="n0_yjmk" tween="true" startValue="0" endValue="1" duration="27"/>
+    <item time="0" type="Alpha" target="n11_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n12_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n13_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n14_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n15_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n16_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n19_droi" tween="true" startValue="0" endValue="1" duration="27"/>
+    <item time="0" type="Alpha" target="n1_yjmk" tween="true" startValue="0" endValue="1" duration="27"/>
+    <item time="0" type="Alpha" target="n20_droi" tween="true" startValue="0" endValue="1" duration="27"/>
+    <item time="0" type="Alpha" target="n21_droi" tween="true" startValue="0" endValue="1" duration="27" ease="Quad.InOut"/>
+    <item time="0" type="Alpha" target="n2_yjmk" tween="true" startValue="0" endValue="1" duration="27"/>
+    <item time="0" type="Alpha" target="n4_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n5_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n6_yjmk" value="1"/>
+    <item time="0" type="Alpha" target="n6_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n8_yjmk" value="1"/>
+    <item time="0" type="Alpha" target="n8_yjmk" value="0"/>
+    <item time="0" type="XY" target="n19_droi" tween="true" startValue="70,380" endValue="63,380" duration="10" ease="Quad.In"/>
+    <item time="0" type="XY" target="n2_yjmk" tween="true" startValue="335,20" endValue="335,26" duration="11" ease="Quad.InOut"/>
+    <item time="15" type="Alpha" target="n11_yjmk" tween="true" startValue="0.2" endValue="1" duration="19"/>
+    <item time="15" type="Alpha" target="n12_yjmk" tween="true" startValue="0.2" endValue="1" duration="19"/>
+    <item time="15" type="Alpha" target="n13_yjmk" tween="true" startValue="0.2" endValue="1" duration="19"/>
+    <item time="15" type="Alpha" target="n14_yjmk" tween="true" startValue="0.2" endValue="1" duration="19"/>
+    <item time="15" type="Alpha" target="n16_yjmk" tween="true" startValue="0.2" endValue="1" duration="19"/>
+    <item time="15" type="Alpha" target="n4_yjmk" tween="true" startValue="0.2" endValue="1" duration="19"/>
+    <item time="15" type="Alpha" target="n5_yjmk" tween="true" startValue="0.2" endValue="1" duration="19"/>
+    <item time="15" type="Alpha" target="n6_yjmk" tween="true" startValue="0.2" endValue="1" duration="19"/>
+    <item time="15" type="Alpha" target="n8_yjmk" tween="true" startValue="0.2" endValue="1" duration="19"/>
+    <item time="18" type="Alpha" target="n15_yjmk" tween="true" startValue="0.2" endValue="1" duration="16"/>
+  </transition>
 </component>
 </component>

+ 5 - 2
GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs

@@ -117,12 +117,15 @@ namespace GFGGame
                     ViewManager.Show<BagExchangeView>(itemCfg.id);
                     ViewManager.Show<BagExchangeView>(itemCfg.id);
                 }
                 }
             }
             }
-            else
+            else if (itemCfg.itemType == ConstItemType.GIFT_BAG)
             {
             {
                 //ConstItemType.GIFT_BAG 礼包
                 //ConstItemType.GIFT_BAG 礼包
                 //随机礼包--还未有该需求,但是配置表有了,先不管,之后有随机礼包需求可以在这里加判断处理
                 //随机礼包--还未有该需求,但是配置表有了,先不管,之后有随机礼包需求可以在这里加判断处理
                 //自选礼包
                 //自选礼包
-                ViewManager.Show<GiftBoxSelectorView>(itemCfg.id);
+                if (itemCfg.subType == ConstItemSubType.GIFT_BAG_SELECTABLE)
+                {
+                    ViewManager.Show<GiftBoxSelectorView>(itemCfg.id);
+                }
             }
             }
         }
         }