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

FGUIProject/assets/EnduringGiftBox/EnduringGiftBoxUI.xml

@@ -27,14 +27,14 @@
     <component id="n36_qqhz" name="btnBack" src="qqhz26" fileName="components/BnBack.xml" xy="497,1064"/>
   </displayList>
   <transition name="t1">
-    <item time="0" type="Alpha" target="n0_qqhz" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n0_qqhz" tween="true" startValue="0" endValue="1" duration="15" ease="Linear"/>
     <item time="0" type="Alpha" target="n12_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n14_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n15_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n1_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n27_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n29_qqhz" value="0"/>
-    <item time="0" type="Alpha" target="n2_qqhz" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n2_qqhz" tween="true" startValue="0" endValue="1" duration="15" ease="Linear"/>
     <item time="0" type="Alpha" target="n33_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n34_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n35_qqhz" value="0"/>
@@ -42,31 +42,31 @@
     <item time="0" type="Alpha" target="n5_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n6_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n9_qqhz" value="0"/>
-    <item time="0" type="Rotation" target="n0_qqhz" tween="true" startValue="-2" endValue="0" duration="15"/>
+    <item time="0" type="Rotation" target="n0_qqhz" tween="true" startValue="-2" endValue="0" duration="15" ease="Linear"/>
     <item time="0" type="Visible" target="n29_qqhz" value="false"/>
-    <item time="0" type="XY" target="n1_qqhz" tween="true" startValue="6,96" endValue="37,61" duration="12"/>
-    <item time="0" type="XY" target="n2_qqhz" tween="true" startValue="-25,400" endValue="30,365" duration="15"/>
+    <item time="0" type="XY" target="n1_qqhz" tween="true" startValue="6,96" endValue="37,61" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n2_qqhz" tween="true" startValue="-25,400" endValue="30,365" duration="15" ease="Linear"/>
     <item time="5" type="Alpha" target="n29_qqhz" value="0"/>
-    <item time="5" type="Alpha" target="n3_qqhz" tween="true" startValue="0.2" endValue="1" duration="10"/>
-    <item time="9" type="Alpha" target="n33_qqhz" tween="true" startValue="0.7" endValue="1" duration="9"/>
-    <item time="12" type="Alpha" target="n1_qqhz" tween="true" startValue="0.2" endValue="1" duration="11"/>
-    <item time="12" type="Alpha" target="n29_qqhz" tween="true" startValue="0.4" endValue="1" duration="13"/>
-    <item time="12" type="Alpha" target="n6_qqhz" tween="true" startValue="0.6" endValue="1" duration="9"/>
-    <item time="12" type="Scale" target="n29_qqhz" tween="true" startValue="0.85,0.85" endValue="1,1" duration="10"/>
+    <item time="5" type="Alpha" target="n3_qqhz" tween="true" startValue="0.2" endValue="1" duration="10" ease="Linear"/>
+    <item time="9" type="Alpha" target="n33_qqhz" tween="true" startValue="0.7" endValue="1" duration="9" ease="Linear"/>
+    <item time="12" type="Alpha" target="n1_qqhz" tween="true" startValue="0.2" endValue="1" duration="11" ease="Linear"/>
+    <item time="12" type="Alpha" target="n29_qqhz" tween="true" startValue="0.4" endValue="1" duration="13" ease="Linear"/>
+    <item time="12" type="Alpha" target="n6_qqhz" tween="true" startValue="0.6" endValue="1" duration="9" ease="Linear"/>
+    <item time="12" type="Scale" target="n29_qqhz" tween="true" startValue="0.85,0.85" endValue="1,1" duration="10" ease="Linear"/>
     <item time="12" type="Visible" target="n29_qqhz" value="true"/>
-    <item time="13" type="Alpha" target="n5_qqhz" tween="true" startValue="0.5" endValue="1" duration="8"/>
-    <item time="14" type="Alpha" target="n34_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="14" type="Alpha" target="n9_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="15" type="Alpha" target="n12_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="15" type="Alpha" target="n14_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="15" type="Alpha" target="n35_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="18" type="Alpha" target="n15_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="18" type="Alpha" target="n27_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="18" type="Alpha" target="n33_qqhz" tween="true" startValue="1" endValue="0.028" duration="15"/>
+    <item time="13" type="Alpha" target="n5_qqhz" tween="true" startValue="0.5" endValue="1" duration="8" ease="Linear"/>
+    <item time="14" type="Alpha" target="n34_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="14" type="Alpha" target="n9_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="15" type="Alpha" target="n12_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="15" type="Alpha" target="n14_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="15" type="Alpha" target="n35_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="18" type="Alpha" target="n15_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="18" type="Alpha" target="n27_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="18" type="Alpha" target="n33_qqhz" tween="true" startValue="1" endValue="0.028" duration="15" ease="Linear"/>
     <item time="24" type="Visible" target="n30_qqhz" value="true"/>
-    <item time="25" type="Alpha" target="n30_qqhz" tween="true" startValue="0.5" endValue="1" duration="18"/>
-    <item time="33" type="Alpha" target="n33_qqhz" tween="true" startValue="0.028" endValue="0" duration="3"/>
-    <item time="43" type="Alpha" target="n30_qqhz" tween="true" startValue="1" endValue="0" duration="24"/>
+    <item time="25" type="Alpha" target="n30_qqhz" tween="true" startValue="0.5" endValue="1" duration="18" ease="Linear"/>
+    <item time="33" type="Alpha" target="n33_qqhz" tween="true" startValue="0.028" endValue="0" duration="3" ease="Linear"/>
+    <item time="43" type="Alpha" target="n30_qqhz" tween="true" startValue="1" endValue="0" duration="24" ease="Linear"/>
     <item time="68" type="Visible" target="n30_qqhz" value="false"/>
   </transition>
   <transition name="t2" autoPlay="true" autoPlayRepeat="-1" autoPlayDelay=".5">

FGUIProject/assets/EnduringGiftBox/RushSaleGiftBoxUI.xml

@@ -24,35 +24,37 @@
     <group id="n23_droi" name="n23" xy="193,207" size="746,626"/>
   </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="n0_yjmk" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
     <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="n19_droi" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
+    <item time="0" type="Alpha" target="n1_yjmk" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
+    <item time="0" type="Alpha" target="n20_droi" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
+    <item time="0" type="Alpha" target="n21_droi" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
+    <item time="0" type="Alpha" target="n2_yjmk" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
     <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"/>
+    <item time="0" type="Scale" target="n0_yjmk" tween="true" startValue="0.95,0.95" endValue="1,1" duration="10" ease="Linear"/>
+    <item time="0" type="XY" target="n0_yjmk" tween="true" startValue="55,20" endValue="44,23" duration="10" ease="Linear"/>
+    <item time="0" type="XY" target="n19_droi" tween="true" startValue="70,380" endValue="63,380" duration="10" ease="Linear"/>
+    <item time="0" type="XY" target="n2_yjmk" tween="true" startValue="335,20" endValue="335,26" duration="11" ease="Linear"/>
+    <item time="15" type="Alpha" target="n11_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n12_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n13_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n14_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n16_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n4_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n5_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n6_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n8_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="18" type="Alpha" target="n15_yjmk" tween="true" startValue="0.2" endValue="1" duration="16" ease="Linear"/>
   </transition>
 </component>

FGUIProject/assets/EnduringGiftBox/components/BtnIcoWeekPromptTag.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="37,37">
+  <displayList>
+    <image id="n0_droi" name="n0" src="qqhz1p" fileName="images/lm_tb_tishi.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/package.xml

@@ -83,7 +83,7 @@
     <image id="yjmk3b" name="an_pink.png" path="/images/"/>
     <component id="droi3c" name="BtnUp.xml" path="/components/" exported="true"/>
     <component id="droi3d" name="BtnNext.xml" path="/components/" exported="true"/>
-    <component id="droi3e" name="BtnIcoWeekPromptTag.xml" path="/components/" exported="true"/>
+    <component id="droi3g" name="BtnIcoWeekPromptTag.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/EnduringGiftBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml

@@ -19,16 +19,15 @@
     <component id="n45_mbf1" name="btnShop" src="mbf1taf" fileName="components/Button5.xml" xy="35,328" group="n52_mbf1">
       <Button icon="ui://drx9d1usmbf1taj"/>
     </component>
-    <component id="n47_mbf1" name="btnGiftBag" src="mbf1taf" fileName="components/Button5.xml" xy="35,443" group="n51_mbf1">
+    <component id="n47_mbf1" name="btnGiftBag" src="mbf1taf" fileName="components/Button5.xml" xy="35,443" group="n51_mbf1" visible="false">
       <Button icon="ui://drx9d1usmbf1tak"/>
     </component>
-    <image id="n49_mbf1" name="n49" src="mbf1tal" fileName="images/cj_sj_db.png" xy="18,523" group="n51_mbf1"/>
-    <text id="n50_mbf1" name="txtGiftBagTime" xy="32,518" pivot="0.5,0" size="100,39" group="n51_mbf1" fontSize="28" color="#fffbf9" align="center" text="03:23:45"/>
-    <group id="n51_mbf1" name="n51" xy="18,443" size="128,114" group="n52_mbf1" advanced="true"/>
-    <group id="n52_mbf1" name="n52" xy="18,213" size="128,344" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <component id="n57_droi" name="comBagTime" src="droitan" fileName="components/ComBagTime.xml" xy="18,523" group="n51_mbf1" visible="false"/>
+    <group id="n51_mbf1" name="n51" xy="18,443" size="130,112" group="n52_mbf1" advanced="true"/>
+    <group id="n52_mbf1" name="n52" xy="18,213" size="130,342" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
     <image id="n56_mbf1" name="n56" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
     <image id="n53_mbf1" name="n53" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
-    <text id="n44_mbf1" name="txtCount" xy="240,1496" pivot="0.5,0" size="600,42" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" vars="true" text="{value=15}次摘星内必得{name=沧海月明}限定部件或对应词牌"/>
+    <text id="n44_mbf1" name="txtCount" xy="236,1496" pivot="0.5,0" size="608,42" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" vars="true" text="{value=15}次摘星内必得{name=沧海月明}限定部件或对应词牌"/>
     <group id="n54_mbf1" name="n54" xy="136,1496" size="808,43" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>

FGUIProject/assets/LuckyBox/components/ComBagTime.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="130,32">
+  <displayList>
+    <image id="n0_droi" name="n0" src="mbf1tal" fileName="images/cj_sj_db.png" xy="-2,0"/>
+    <text id="n1_droi" name="txtGiftBagTime" xy="11,-5" pivot="0.5,0" size="100,39" fontSize="28" color="#fffbf9" align="center" text="03:23:45"/>
+  </displayList>
+</component>

FGUIProject/assets/LuckyBox/package.xml

@@ -71,73 +71,7 @@
     <image id="mbf1tak" name="cj_meirith.png" path="/images/"/>
     <image id="mbf1tal" name="cj_sj_db.png" path="/images/"/>
     <image id="mbf1tam" name="cj_tswz_db.png" path="/images/"/>
-    <image id="volstan" name="bt_tiaoguo.png" path="/imageNews/"/>
-    <image id="volstao" name="zx_bg_zhuangshi.png" path="/imageNews/"/>
-    <image id="volstap" name="zx_jindu_bg.png" path="/imageNews/"/>
-    <image id="volstaq" name="zx_title_bg.png" path="/imageNews/"/>
-    <image id="volstar" name="zx_title_guangdian.png" path="/imageNews/"/>
-    <image id="volstas" name="zx_title_xianding.png" path="/imageNews/"/>
-    <image id="volstat" name="zx_title_zi.png" path="/imageNews/"/>
-    <image id="volstau" name="zx_title_zi_guangxiao.png" path="/imageNews/"/>
-    <image id="volstav" name="zx_title_zi_star.png" path="/imageNews/"/>
-    <image id="volstaw" name="zx_title_zi_zhuangshi.png" path="/imageNews/"/>
-    <image id="volstax" name="zx_yulan_diaoshi.png" path="/imageNews/"/>
-    <image id="volstay" name="zx_yulan_tubiao.png" path="/imageNews/"/>
-    <image id="volstaz" name="zx_yulan_tubiao_bg.png" path="/imageNews/"/>
-    <image id="volstb0" name="zx_yulan_xinggui.png" path="/imageNews/"/>
-    <image id="volstb1" name="bt_jiaobiao_bichu.png" path="/imageNews/"/>
-    <image id="volstb2" name="zx_bg_yueliang.png" path="/imageNews/"/>
-    <image id="volstb3" name="zx_lianxian_lan_guangquan.png" path="/imageNews/"/>
-    <image id="volstb4" name="zx_lianxian_lan_shang.png" path="/imageNews/"/>
-    <image id="volstb5" name="zx_lianxian_lan_star_1.png" path="/imageNews/"/>
-    <image id="volstb6" name="zx_lianxian_lan_star_2.png" path="/imageNews/"/>
-    <image id="volstb7" name="zx_lianxian_lan_star_3.png" path="/imageNews/"/>
-    <image id="volstb8" name="zx_lianxian_lan_xia.png" path="/imageNews/"/>
-    <image id="volstb9" name="zx_lianxian_lan_xian.png" path="/imageNews/"/>
-    <image id="volstba" name="zx_lianxian_bg_zhuangshi.png" path="/imageNews/"/>
-    <image id="volstbb" name="zx_lianxian_huang_guangquan.png" path="/imageNews/"/>
-    <image id="volstbc" name="zx_lianxian_huang_shang.png" path="/imageNews/"/>
-    <image id="volstbd" name="zx_lianxian_huang_star_1.png" path="/imageNews/"/>
-    <image id="volstbe" name="zx_lianxian_huang_star_2.png" path="/imageNews/"/>
-    <image id="volstbf" name="zx_lianxian_huang_star_3.png" path="/imageNews/"/>
-    <image id="volstbg" name="zx_lianxian_huang_xia.png" path="/imageNews/"/>
-    <image id="volstbh" name="zx_lianxian_huang_xian.png" path="/imageNews/"/>
-    <image id="volstbi" name="zx_yuan_tx_waiquan.png" path="/imageNews/"/>
-    <image id="volstbj" name="zx_yuan_tx_hengguang.png" path="/imageNews/"/>
-    <image id="volstbk" name="zx_yuan_tx_diandian.png" path="/imageNews/"/>
-    <image id="volstbl" name="zx_wp_mingcheng_bg.png" path="/imageNews/"/>
-    <image id="volstbm" name="zx_wp_lan_diguang.png" path="/imageNews/"/>
-    <image id="volstbn" name="zx_wp_lan_bg.png" path="/imageNews/"/>
-    <image id="volstbo" name="zx_wp_jin_xian.png" path="/imageNews/"/>
-    <image id="volstbp" name="zx_yuan_tx_neiquan.png" path="/imageNews/"/>
-    <image id="volstbq" name="zx_wp_jin_jiaobiao.png" path="/imageNews/"/>
-    <image id="volstbr" name="zx_wp_jin_diguang.png" path="/imageNews/"/>
-    <image id="volstbs" name="zx_wp_jin_bg.png" path="/imageNews/"/>
-    <image id="volstbt" name="zx_wp_fen_xian.png" path="/imageNews/"/>
-    <image id="volstbu" name="zx_wp_fen_guangxiao.png" path="/imageNews/"/>
-    <image id="volstbv" name="zx_wp_fen_diguang.png" path="/imageNews/"/>
-    <image id="volstbw" name="zx_wp_fen_bg.png" path="/imageNews/"/>
-    <image id="volstbx" name="zx_wp_jin_guangxiao.png" path="/imageNews/"/>
-    <image id="volstby" name="zx_yuan_tx_star.png" path="/imageNews/"/>
-    <image id="volstbz" name="zx_tc_title_zhuangshi.png" path="/imageNews/"/>
-    <image id="volstc0" name="wp_bg_shuliang.png" path="/imageNews/"/>
-    <image id="volstc3" name="zx_tc_bg.png" path="/imageNews/"/>
-    <image id="volstc4" name="zx_tc_piaodai_shang.png" path="/imageNews/"/>
-    <image id="volstc5" name="zx_tc_piaodai_xia.png" path="/imageNews/"/>
-    <image id="volstc6" name="zx_tc_tab_bg.png" path="/imageNews/" scale="9grid" scale9grid="21,0,111,74"/>
-    <image id="volstc7" name="zx_tc_tab_biankuang.png" path="/imageNews/"/>
-    <image id="volstc8" name="zx_tc_tab_xuanzhong.png" path="/imageNews/"/>
-    <image id="volstc9" name="zx_tc_taozhuang_zhuagnshi.png" path="/imageNews/"/>
-    <image id="volstca" name="zx_zhuangshi_xinggui.png" path="/imageNews/"/>
-    <image id="volstcb" name="zx_tx_hengxiang.png" path="/imageNews/"/>
-    <image id="volstcc" name="zx_tx_jiguang.png" path="/imageNews/"/>
-    <image id="volstcd" name="zx_tx_qianjing.png" path="/imageNews/"/>
-    <image id="volstce" name="zx_tx_star.png" path="/imageNews/"/>
-    <image id="volstcf" name="zx_tx_yuanquan.png" path="/imageNews/"/>
-    <image id="volstcg" name="zx_tx_zhongjian.png" path="/imageNews/"/>
-    <image id="volstch" name="zx_wp_baseboard.png" path="/imageNews/"/>
-    <image id="volstci" name="zx_zhuangshi_diaoshi.png" path="/imageNews/"/>
-    <component id="ga165c" name="ButtonTab1.xml" path="/components/"/>
+    <component id="droitan" name="ComBagTime.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBagTime.cs

@@ -4,37 +4,37 @@ using FairyGUI;
 
 namespace UI.LuckyBox
 {
-    public partial class UI_ButtonTab1
+    public partial class UI_ComBagTime
     {
-        public GButton target;
-        public Controller m_c1;
-        public const string URL = "ui://drx9d1usga165c";
+        public GComponent target;
+        public GTextField m_txtGiftBagTime;
+        public const string URL = "ui://drx9d1usdroitan";
         public const string PACKAGE_NAME = "LuckyBox";
-        public const string RES_NAME = "ButtonTab1";
-        private static UI_ButtonTab1 _proxy;
+        public const string RES_NAME = "ComBagTime";
+        private static UI_ComBagTime _proxy;
 
-        public static UI_ButtonTab1 Create(GObject gObject = null)
+        public static UI_ComBagTime Create(GObject gObject = null)
         {
-            var ui = new UI_ButtonTab1();
+            var ui = new UI_ComBagTime();
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GComponent)gObject;
             ui.Init(ui.target);
             return ui;
         }
 
-        public static UI_ButtonTab1 Proxy(GObject gObject = null)
+        public static UI_ComBagTime Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ButtonTab1();
+                _proxy = new UI_ComBagTime();
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GComponent)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -55,11 +55,11 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
+            m_txtGiftBagTime = (GTextField)comp.GetChild("txtGiftBagTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
+            m_txtGiftBagTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBagTime.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 85968a23564a5d7478d64f3d02f08b9c
+guid: 0433c9971abb69243bc82a0a0c17586d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs

@@ -14,7 +14,7 @@ namespace UI.LuckyBox
         public GButton m_btnReward;
         public GButton m_btnShop;
         public GButton m_btnGiftBag;
-        public GTextField m_txtGiftBagTime;
+        public UI_ComBagTime m_comBagTime;
         public GTextField m_txtCount;
         public const string URL = "ui://drx9d1usmbf1tad";
         public const string PACKAGE_NAME = "LuckyBox";
@@ -70,7 +70,7 @@ namespace UI.LuckyBox
             m_btnReward = (GButton)comp.GetChild("btnReward");
             m_btnShop = (GButton)comp.GetChild("btnShop");
             m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
-            m_txtGiftBagTime = (GTextField)comp.GetChild("txtGiftBagTime");
+            m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
@@ -83,7 +83,8 @@ namespace UI.LuckyBox
             m_btnReward = null;
             m_btnShop = null;
             m_btnGiftBag = null;
-            m_txtGiftBagTime = null;
+            m_comBagTime.Dispose();
+            m_comBagTime = null;
             m_txtCount = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxPreShowUI.cs

@@ -8,8 +8,8 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
-        public UI_ButtonTab1 m_btnItem;
-        public UI_ButtonTab1 m_btnProb;
+        public GComponent m_btnItem;
+        public GComponent m_btnProb;
         public GList m_list;
         public UI_Component1 m_compText;
         public const string URL = "ui://drx9d1usga16e";
@@ -60,17 +60,15 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_btnItem = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnItem"));
-            m_btnProb = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnProb"));
+            m_btnItem = (GComponent)comp.GetChild("btnItem");
+            m_btnProb = (GComponent)comp.GetChild("btnProb");
             m_list = (GList)comp.GetChild("list");
             m_compText = (UI_Component1)UI_Component1.Create(comp.GetChild("compText"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_btnItem.Dispose();
             m_btnItem = null;
-            m_btnProb.Dispose();
             m_btnProb = null;
             m_list = null;
             m_compText.Dispose();

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -150,11 +150,14 @@ namespace GFGGame
                 .Where(a => a.endTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_txtGiftBagTime.text = "已结束";
+                _ui.m_comBagTime.target.visible = false;
+                _ui.m_btnGiftBag.visible = false;
             }
             else
             {
-                _ui.m_txtGiftBagTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].endTime);
+                _ui.m_comBagTime.m_txtGiftBagTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].endTime);
+                _ui.m_comBagTime.target.visible = true;
+                _ui.m_btnGiftBag.visible = true;
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -683,11 +683,12 @@ namespace GFGGame
                 .Where(a => a.endTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_btnGiftBag1.m_txtTime.text = "已结束";
+                _ui.m_btnGiftBag1.target.visible = false;
             }
             else
             {
                 _ui.m_btnGiftBag1.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].endTime);
+                _ui.m_btnGiftBag1.target.visible = true;
             }
         }
 
@@ -700,11 +701,12 @@ namespace GFGGame
                 .Where(a => a.endTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_btnGiftBag2.m_txtTime.text = "已结束";
+                _ui.m_btnGiftBag2.target.visible = false;
             }
             else
             {
                 _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].endTime);
+                _ui.m_btnGiftBag2.target.visible = true;
             }
         }
 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: b24f53d674cdb124aba65f65b7fabe25
-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: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 591f4134b05ced347bc606d8c5909316
-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: