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

* 'master' of http://10.108.64.190:3000/gfg/Client:
  个人相册
  替换资源
  套装动作显示检查资源
  滚动广告
  套装动作显示检查资源
  修复bug
  修复BUG,活动结束不显示ICON
  修复一些BUG

FGUIProject/assets/Bag/GiftBoxSelectorUI.xml

@@ -4,8 +4,8 @@
     <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="v5notm1" fileName="images/lm_dt_zsx1.png" xy="243,72" group="n11_v5no"/>
-    <image id="n2_v5no" name="n2" src="v5notm2" fileName="images/lm_dt_zsx2.png" xy="587,71" 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="稀有升星材料(自选)"/>

FGUIProject/assets/Bag/package.xml

@@ -12,8 +12,6 @@
     <image id="v5notly" name="back.png" path="/images/"/>
     <image id="v5notlz" name="lm_an__xuanzhong_1.png" path="/images/"/>
     <image id="v5notm0" name="lm_db_3.png" path="/images/"/>
-    <image id="v5notm1" name="lm_dt_zsx1.png" path="/images/"/>
-    <image id="v5notm2" name="lm_dt_zsx2.png" path="/images/"/>
     <image id="v5notm3" name="lm_zhuangshixian_duan.png" path="/images/"/>
     <image id="v5notm4" name="lm_zsx0.png" path="/images/"/>
     <image id="v5notm5" name="tanchuang_2.png" path="/images/"/>

FGUIProject/assets/DailyWelfare/package.xml

@@ -68,7 +68,6 @@
     <image id="vols1r" name="hdbn_zsx.png" path="/images/"/>
     <image id="vols1s" name="hdrk_biaotz.png" path="/images/"/>
     <image id="vols1t" name="hdrk_zz.png" path="/images/"/>
-    <image id="vols1u" name="zjm_guanggao_kuang.png" path="/images/"/>
     <image id="vols1v" name="hd_sj_dkuang.png" path="/images/"/>
     <image id="vols1w" name="hdbn_db.png" path="/images/"/>
     <image id="vols1x" name="hdbn_mrbj.png" path="/images/"/>

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

FGUIProject/assets/Main/MainUI.xml

@@ -64,17 +64,20 @@
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
     <group id="n57_oju1" name="grpList" xy="942,321" size="108,1397" group="n52_qqat" advanced="true"/>
-    <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,457" group="n89_vols">
+    <component id="n90_vols" name="comListAd" src="volsos" fileName="components/ComAd.xml" xy="0,314" size="411,145" group="n89_vols"/>
+    <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,469" group="n89_vols">
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="活动" icon="ui://mfvz4q8kvolsof"/>
     </component>
-    <component id="n78_bhmm" name="btnActivityDay7" src="volsoq" fileName="components/BtnModle1.xml" xy="22,596" group="n89_vols" controller="c1,1">
+    <component id="n78_bhmm" name="btnActivityDay7" src="volsoq" fileName="components/BtnModle1.xml" xy="22,608" group="n89_vols" controller="c1,1">
       <Button title="七日活动" icon="ui://mfvz4q8kvolsoh"/>
     </component>
-    <component id="n75_mbf1" name="btnActivityLuckyBox" src="volsoq" fileName="components/BtnModle1.xml" xy="22,763" group="n89_vols" controller="c1,1">
+    <component id="n75_mbf1" name="btnActivityLuckyBox" src="volsoq" fileName="components/BtnModle1.xml" xy="22,775" group="n89_vols" controller="c1,1">
       <Button title="镜花水月" icon="ui://mfvz4q8kvolsog"/>
     </component>
-    <group id="n89_vols" name="n89" xy="22,457" size="141,463" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true"/>
+    <group id="n89_vols" name="n89" xy="0,314" size="411,618" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">
+      <relation target="" sidePair="left-left,top-top"/>
+    </group>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>
     <component id="n73_mzf8" name="btnArena" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8in"/>

FGUIProject/assets/Main/components/ComAd.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="381,145">
+  <displayList>
+    <image id="n95_vols" name="n95" src="volsop" fileName="imagesNew/zjm_guanggao_zsx.png" xy="-4,21" group="n98_vols"/>
+    <list id="n90_vols" name="listAd" xy="0,0" size="381,131" group="n98_vols" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="8" defaultItem="ui://mfvz4q8kvolsot">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n94_vols" name="listAdSelect" xy="179,106" pivot="1,0" size="187,14" group="n98_vols" layout="row" scroll="horizontal" colGap="10" defaultItem="ui://mfvz4q8kvolsou" align="right">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n96_vols" name="n96" src="volsom" fileName="imagesNew/zjm_guanggao_kuang.png" xy="0,0" group="n98_vols"/>
+    <group id="n98_vols" name="n98" xy="-4,0" size="385,135" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComAdSelectItem.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="14,14" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n0_vols" name="n0" src="volsoo" fileName="imagesNew/zjm_guanggao_point_2.png" xy="0,0">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_vols" name="n1" src="volson" fileName="imagesNew/zjm_guanggao_point_1.png" xy="0,0">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Main/components/ListAdItem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="381,131">
+  <displayList>
+    <loader id="n91_vols" name="loaRes" xy="0,0" size="381,131" url="ui://mfvz4q8kvolsoi" autoSize="true"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/package.xml

@@ -452,8 +452,8 @@
     <component id="psphix" name="ComDeduction.xml" path="/components/"/>
     <component id="psphiy" name="ComSkillShow.xml" path="/components/"/>
     <component id="psphiz" name="ComTargetCard.xml" path="/components/"/>
-    <component id="psphj0" name="ComClick.xml" path="/"/>
-    <component id="psphj1" name="ComSkillTips.xml" path="/"/>
+    <component id="psphj0" name="ComClick(1).xml" path="/components/"/>
+    <component id="psphj1" name="ComSkillTips.xml" path="/components/"/>
     <component id="psphj2" name="ComAllCircle.xml" path="/components/"/>
     <component id="psphj4" name="ComAllPerfect.xml" path="/components/"/>
     <component id="psphj5" name="ComClick.xml" path="/components/"/>
@@ -628,18 +628,21 @@
     <image id="volsod" name="zjm_tb_cz_xsqg.png" path="/imagesNew/"/>
     <image id="volsoe" name="zjm_tb_db_hd.png" path="/imagesNew/" scale="9grid" scale9grid="35,7,70,14"/>
     <image id="volsof" name="zjm_tb_hd.png" path="/imagesNew/"/>
-    <image id="volsog" name="zjm_tb_jhsy.png" path="/imagesNew/"/>
+    <image id="volsog" name="zjm_tb_jhsy.png" path="/imagesNew/" exported="true"/>
     <image id="volsoh" name="zjm_tb_qrhd.png" path="/imagesNew/"/>
-    <image id="volsoi" name="guanggao_mrqd.png" path="/imagesNew/"/>
-    <image id="volsoj" name="guanggao_xsgl_kqdnf.png" path="/imagesNew/"/>
-    <image id="volsok" name="guanggao_xslc_wylh.png" path="/imagesNew/"/>
-    <image id="volsol" name="guanggao_xslc_xslgt.png" path="/imagesNew/"/>
+    <image id="volsoi" name="guanggao_mrqd.png" path="/imagesNew/" exported="true"/>
+    <image id="volsoj" name="guanggao_kqdnf.png" path="/imagesNew/" exported="true"/>
+    <image id="volsok" name="guanggao_wylh.png" path="/imagesNew/" exported="true"/>
+    <image id="volsol" name="guanggao_xslgt.png" path="/imagesNew/" exported="true"/>
     <image id="volsom" name="zjm_guanggao_kuang.png" path="/imagesNew/"/>
     <image id="volson" name="zjm_guanggao_point_1.png" path="/imagesNew/"/>
     <image id="volsoo" name="zjm_guanggao_point_2.png" path="/imagesNew/"/>
     <image id="volsop" name="zjm_guanggao_zsx.png" path="/imagesNew/"/>
     <component id="volsoq" name="BtnModle1.xml" path="/components/"/>
     <image id="volsor" name="zjm_gn_yj.png" path="/images/"/>
+    <component id="volsos" name="ComAd.xml" path="/components/"/>
+    <component id="volsot" name="ListAdItem.xml" path="/components/"/>
+    <component id="volsou" name="ComAdSelectItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleInfo/components/ListPhotoItem.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="448,590">
   <displayList>
-    <image id="n48_r9ri" name="n48" src="r9ri15" fileName="images/grxx_zyjiah.png" xy="0,0"/>
+    <image id="n48_r9ri" name="n48" src="volsgh" fileName="images/grxc_db.png" xy="0,0"/>
+    <image id="n50_vols" name="n50" src="volsgi" fileName="images/tb_jiahao.png" xy="122,193"/>
     <component id="n49_r9ri" name="comPhoto" src="r9ri1o" fileName="components/ComPhoto.xml" xy="2,2" size="444,586"/>
+    <image id="n55_vols" name="n55" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="202,249" group="n54_vols"/>
+    <image id="n51_vols" name="n51" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="13,287" group="n54_vols"/>
+    <text id="n52_vols" name="txtLock" xy="163,274" pivot="0.5,0" size="122,42" group="n54_vols" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#d7c09f" align="center" vAlign="middle" leading="1" text="金卡开启"/>
+    <image id="n53_vols" name="n53" src="volsgj" fileName="componentsBg/lm_dt_zsx2.png" xy="305,287" group="n54_vols"/>
+    <group id="n54_vols" name="grpLock" xy="13,249" size="422,66" advanced="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/package.xml

@@ -48,7 +48,6 @@
     <image id="r9ri12" name="grxx_zyddt.png" path="/images/" scale="9grid" scale9grid="267,350,534,700"/>
     <image id="r9ri13" name="grxx_zydik.png" path="/images/"/>
     <image id="r9ri14" name="grxx_zygrxc.png" path="/images/"/>
-    <image id="r9ri15" name="grxx_zyjiah.png" path="/images/"/>
     <image id="r9ri16" name="grxx_zyshul.png" path="/images/"/>
     <image id="r9ri17" name="grxx_zytxtx.png" path="/images/"/>
     <image id="r9ri18" name="grxx_grxcxc.png" path="/images/"/>
@@ -75,6 +74,9 @@
     <component id="v95qg2" name="OtherRoleInfoUI.xml" path="/" exported="true"/>
     <component id="v95qg3" name="ListHeadBorderItem.xml" path="/components/"/>
     <image id="ysx9gg" name="zjm_dj_1.png" path="/images/"/>
+    <image id="volsgh" name="grxc_db.png" path="/images/"/>
+    <image id="volsgi" name="tb_jiahao.png" path="/images/"/>
+    <image id="volsgj" name="lm_dt_zsx2.png" path="/componentsBg/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/RoleInfo" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -111,6 +111,8 @@ namespace GFGGame
             await ShopSProxy.ReqShopInfo();
             await StudioSProxy.ReqStudioInfos();
             await RoleInfoSProxy.ReqPersonalInfo();
+            await ActivityGlobalSProxy.GetActivityInfo();
+
 
             GameGlobal.lastLoginTime = StorageDataManager.Instance.GetStorageValue(ConstStorageId.LAST_LOGIN_TIME);
             long lastTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
@@ -258,7 +260,6 @@ namespace GFGGame
             EnduringGiftBoxSProxy.ReqGetAllGiftBagRebateStatus().Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.LeagueQuestion).Coroutine();
-            ActivityGlobalSProxy.GetActivityInfo().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

GameClient/Assets/Game/HotUpdate/Data/DressUpMenuSuitDataManager.cs

@@ -250,5 +250,12 @@ namespace GFGGame
             EventAgent.DispatchEvent(ConstMessage.SUIT_BOX_STATUS_CHANGED, suitId);
         }
 
+        //检查套装是否有动作资源
+        public static bool CheckSuitHasActionRes(int suitId)
+        {
+            var suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            return suitCfg != null && ResPathUtil.CheckDressUpAnimationExist(suitCfg.aniRes);
+        }
+
     }
 }

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -47,18 +47,6 @@ namespace GFGGame
             }
         }
 
-        public bool HasSuitActionRes
-        {
-            get
-            {
-                if (_dressUpData.suitId > 0)
-                {
-                    return SuitCfgArray.Instance.CheckSuitHasAction(_dressUpData.suitId);
-                }
-                return false;
-            }
-        }
-
         public List<int> itemList
         {
             get
@@ -305,7 +293,8 @@ namespace GFGGame
             }
             TakeOffAll(false);
             _dressUpData.suitId = id;
-            _dressUpData.actionId = (HasSuitActionRes && tryShowAction) ? id : 0;
+            bool hasSuitActionRes = DressUpMenuSuitDataManager.CheckSuitHasActionRes(_dressUpData.suitId);
+            _dressUpData.actionId = (hasSuitActionRes && tryShowAction) ? id : 0;
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.suitId);
             List<int> items = new List<int>(suitCfg.partsArr);
             if (showOptional)
@@ -336,6 +325,63 @@ namespace GFGGame
             UpdateWholeBodyView();
         }
 
+        //穿上一个动作
+        public void PutOnAction(int actionId)
+        {
+            bool hasSuitActionRes = DressUpMenuSuitDataManager.CheckSuitHasActionRes(_dressUpData.suitId);
+            _dressUpData.actionId = actionId;
+            if(hasSuitActionRes)
+            {
+                foreach (int itemId in itemList)
+                {
+                    bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, _dressUpData.actionId);
+                    if (!replaceableByAction)
+                    {
+                        AddOrRemove(itemId, false, false, true);
+                    }
+                }
+            }
+            else
+            {
+                CancelAction(true);
+            }
+            checkDefaultItem();
+            UpdateWholeBodyView();
+        }
+
+        //取消动作
+        public void CancelAction(bool changeToStand = false)
+        {
+            if (_dressUpData.actionId <= 0)
+            {
+                return;
+            }
+            var tempActionId = _dressUpData.actionId;
+            _dressUpData.actionId = 0;
+            if (changeToStand)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(tempActionId);
+                List<int> items = new List<int>(suitCfg.partsArr);
+                if (suitCfg.partsOptionalArr != null && suitCfg.partsOptionalArr.Length > 0)
+                {
+                    items.AddRange(suitCfg.partsOptionalArr);
+                }
+                foreach (int itemId in items)
+                {
+                    if (DressUpMenuItemDataManager.CheckHasItem(itemId))
+                    {
+                        bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, tempActionId);
+                        if (!replaceableByAction)
+                        {
+                            AddOrRemove(itemId, false, true);
+                        }
+                    }
+                }
+            }
+            checkDefaultItem();
+            UpdateWholeBodyView();
+        }
+
         //穿戴一组换装数据
         public void PutOnDressUpData(DressUpData dressUpData)
         {
@@ -538,8 +584,8 @@ namespace GFGGame
             if (IsAction)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.actionId);
-                var hasAniRes = !string.IsNullOrEmpty(suitCfg.aniRes);
-                var res = hasAniRes ? suitCfg.aniRes : suitCfg.picRes;
+                var hasAniRes = ResPathUtil.CheckDressUpAnimationExist(suitCfg.aniRes);
+                var res = hasAniRes ? suitCfg.aniRes : null;
                 DressUpUtil.UpdateWholeBody(res, _sceneObj, hasAniRes, suitCfg.effRes, false, _roleObj);
             }
             else
@@ -548,57 +594,6 @@ namespace GFGGame
             }
         }
 
-        //穿上一个动作
-        public void PutOnAction(int actionId)
-        {
-            _dressUpData.actionId = actionId;
-            foreach (int itemId in itemList)
-            {
-                bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, _dressUpData.actionId);
-                if (!replaceableByAction)
-                {
-                    AddOrRemove(itemId, false, false, true);
-                }
-            }
-            checkDefaultItem();
-            UpdateWholeBodyView();
-        }
-
-        //取消动作
-        public void CancelAction(bool changeToStand = false)
-        {
-            if (_dressUpData.actionId <= 0)
-            {
-                return;
-            }
-            var tempActionId = _dressUpData.actionId;
-            _dressUpData.actionId = 0;
-            if(changeToStand)
-            {
-                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(tempActionId);
-                List<int> items = new List<int>(suitCfg.partsArr);
-                if (suitCfg.partsOptionalArr != null && suitCfg.partsOptionalArr.Length > 0)
-                {
-                    items.AddRange(suitCfg.partsOptionalArr);
-                }
-                int subType = 0;
-                foreach (int itemId in items)
-                {
-                    if (DressUpMenuItemDataManager.CheckHasItem(itemId))
-                    {
-                        subType = ItemUtilCS.GetItemSubType(itemId);
-                        bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, tempActionId);
-                        if (!replaceableByAction)
-                        {
-                            AddOrRemove(itemId, false, true);
-                        }
-                    }
-                }
-            }
-            checkDefaultItem();
-            UpdateWholeBodyView();
-        }
-
         
     }
 }

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/FairyGUI/GenCode/Main/UI_ComAd.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComAd
+    {
+        public GComponent target;
+        public GList m_listAd;
+        public GList m_listAdSelect;
+        public const string URL = "ui://mfvz4q8kvolsos";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComAd";
+        private static UI_ComAd _proxy;
+
+        public static UI_ComAd Create(GObject gObject = null)
+        {
+            var ui = new UI_ComAd();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComAd Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComAd();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_listAd = (GList)comp.GetChild("listAd");
+            m_listAdSelect = (GList)comp.GetChild("listAdSelect");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listAd = null;
+            m_listAdSelect = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAd.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c7be9a2712f5489408970c4d524c6d5d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListAdItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ListAdItem
+    {
+        public GComponent target;
+        public GLoader m_loaRes;
+        public const string URL = "ui://mfvz4q8kvolsot";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ListAdItem";
+        private static UI_ListAdItem _proxy;
+
+        public static UI_ListAdItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListAdItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListAdItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListAdItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaRes = (GLoader)comp.GetChild("loaRes");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaRes = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListAdItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 370d5f42ad7a81a4187e6ba74bf89cd7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -21,6 +21,7 @@ namespace UI.Main
         public GList m_list;
         public UI_ButtonChange m_btnChange;
         public GGroup m_grpList;
+        public UI_ComAd m_comListAd;
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle1 m_btnActivityDay7;
         public UI_BtnModle1 m_btnActivityLuckyBox;
@@ -100,6 +101,7 @@ namespace UI.Main
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
             m_grpList = (GGroup)comp.GetChild("grpList");
+            m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityLuckyBox"));
@@ -146,6 +148,8 @@ namespace UI.Main
             m_btnChange.Dispose();
             m_btnChange = null;
             m_grpList = null;
+            m_comListAd.Dispose();
+            m_comListAd = null;
             m_btnDailyWelfare.Dispose();
             m_btnDailyWelfare = null;
             m_btnActivityDay7.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListPhotoItem.cs

@@ -8,6 +8,8 @@ namespace UI.RoleInfo
     {
         public GComponent target;
         public UI_ComPhoto m_comPhoto;
+        public GTextField m_txtLock;
+        public GGroup m_grpLock;
         public const string URL = "ui://374k3dwvr9ri1m";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListPhotoItem";
@@ -56,11 +58,15 @@ namespace UI.RoleInfo
         private void Init(GComponent comp)
         {
             m_comPhoto = (UI_ComPhoto)UI_ComPhoto.Create(comp.GetChild("comPhoto"));
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comPhoto.Dispose();
             m_comPhoto = null;
+            m_txtLock = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -111,6 +111,17 @@ namespace GFGGame
         {
             return $"{ANIMATION_DIR_PATH}/DressUp/{res}/{res}.{extName}";
         }
+
+        public static bool CheckDressUpAnimationExist(string res, string extName = "prefab")
+        {
+            if(string.IsNullOrEmpty(res))
+            {
+                return false;
+            }
+            string resPath = ResPathUtil.GetDressUpAnimationPath(res, extName);
+            return VEngine.Versions.Contains(resPath);
+        }
+
         public static string GetDressUpEffectPath(string res, bool inAni = false, string extName = "prefab")
         {
             if(inAni)

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

@@ -20,6 +20,9 @@ namespace GFGGame
         private bool isOpen = false;
         private int _actLuckyBoxId = 0;
         private int _actLimitChargeId = 0;
+        private List<AdCfg> _adIds = new List<AdCfg>();
+        private Vector2 _startPos;
+        private Vector2 _endPos;
         private GButton _btnGongGao;
         private GButton _btnHaoYou;
         private GButton _btnYouJian;
@@ -160,8 +163,15 @@ namespace GFGGame
             _ui.m_loaRight.target.onClick.Add(MoveLeft);
             _ui.m_loaLeft.target.onClick.Add(MoveRight);
 
+            _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
+            _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
+            _ui.m_comListAd.m_listAd.scrollPane.onScrollEnd.Add(OnListAdScrollEnd);
+            _ui.m_comListAd.m_listAd.scrollPane.decelerationRate = 0.8f;
+
             swipeGesture = new SwipeGesture(_ui.target);
             swipeGesture.onAction.Add(OnSwipe);
+            swipeGesture.onBegin.Add(OnSwipeBegin);
+            swipeGesture.onEnd.Add(OnSwipeEnd);
             swipeGesture.actionDistance = swipeDistance;
             _ui.m_list.ResizeToFit();
             _ui.m_btnChange.target.onClick.Add(OnBtnChangClick);
@@ -215,7 +225,15 @@ namespace GFGGame
                 GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             }
             SetPos();
-
+            GetAdIds();
+            _ui.m_comListAd.target.visible = _ui.m_comListAd.m_listAd.numItems > 0;
+            if (_ui.m_comListAd.target.visible)
+            {
+                Timers.inst.Remove(UpdateAdListTime);
+                Timers.inst.Add(3, 0, UpdateAdListTime);
+            }
+            Timers.inst.Remove(Update);
+            Timers.inst.Remove(CheckGuide);
             Timers.inst.AddUpdate(CheckGuide);
             Timers.inst.AddUpdate(Update);
         }
@@ -228,9 +246,11 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
+            _adIds.Clear();
             _valueBarController.OnHide();
             Timers.inst.Remove(Update);
             Timers.inst.Remove(CheckGuide);
+            Timers.inst.Remove(UpdateAdListTime);
         }
 
         protected override void RemoveEventListener()
@@ -300,12 +320,31 @@ namespace GFGGame
                 // _sceneObject.transform.position = new Vector2(-GRoot.inst.width / 100f, 0);
             }
         }
+        private void OnSwipeBegin()
+        {
+            Vector2 pos = Input.mousePosition;
+            pos.y = Screen.height - pos.y;
+
+            _startPos = _ui.target.GlobalToLocal(pos);
+        }
+        private void OnSwipeEnd()
+        {
+            Vector2 pos = Input.mousePosition;
+            pos.y = Screen.height - pos.y;
 
+            _endPos = _ui.target.GlobalToLocal(pos);
+        }
         private void OnSwipe(EventContext context)
         {
             if (!MainDataManager.Instance.CanSwipe) return;
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.MAIN_SECOND_VIEW, false)) return;
 
+            if (_ui.m_comListAd.m_listAd.numItems > 0//滚动广告区域不可切换页面
+            && _startPos.x > _ui.m_comListAd.target.x && _startPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
+            && _startPos.y > _ui.m_comListAd.target.y && _startPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)
+            && _endPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
+            && _endPos.y > _ui.m_comListAd.target.y && _endPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)) return;
+
             SwipeGesture swipeture = (SwipeGesture)context.sender;
             if (MainDataManager.Instance.ViewType == 0 && swipeture.position.x < 0 &&
                 swipeture.position.y < -swipeture.position.x && swipeture.position.y > swipeture.position.x)
@@ -683,11 +722,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 +740,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;
             }
         }
 
@@ -723,7 +764,7 @@ namespace GFGGame
                 }
                 ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
                 _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
-
+                _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
                 long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
                 _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
@@ -812,7 +853,62 @@ namespace GFGGame
             RoleInfoManager.Instance.UpdateHead(_ui.m_headBar.m_comHead, RoleDataManager.headId,
                 RoleDataManager.headBorderId);
         }
+        /// <summary>
+        /// 获取当前开启的滚动广告列表
+        /// </summary>
+        private void GetAdIds()
+        {
+            _adIds.Clear();
+            for (int i = 0; i < AdCfgArray.Instance.dataArray.Length; i++)
+            {
+                AdCfg adCfg = AdCfgArray.Instance.dataArray[i];
+                if (adCfg.activityId > 0 && ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
+                if (!string.IsNullOrEmpty(adCfg.startTime) && !string.IsNullOrEmpty(adCfg.endTime))
+                {
+                    long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
+                    long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
+                    if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime) continue;
+                }
+                _adIds.Add(adCfg);
+            }
+            _ui.m_comListAd.m_listAd.numItems = _adIds.Count;
+            _ui.m_comListAd.m_listAdSelect.numItems = _adIds.Count;
+            if (_ui.m_comListAd.m_listAd.numItems > 0)
+            {
+                _ui.m_comListAd.m_listAd.ScrollToView(0);
+                _ui.m_comListAd.m_listAdSelect.selectedIndex = 0;
+            }
+        }
+        private void UpdateAdListTime(object param)
+        {
+            int itemIndex = _ui.m_comListAd.m_listAd.ChildIndexToItemIndex(0) + 1;
+            itemIndex = itemIndex == _ui.m_comListAd.m_listAd.numItems ? 0 : itemIndex;
+            _ui.m_comListAd.m_listAdSelect.selectedIndex = itemIndex;
+            _ui.m_comListAd.m_listAd.scrollPane.ScrollRight(0.8f, true);
+        }
+        private void RenderListAdItem(int index, GObject obj)
+        {
+            UI_ListAdItem item = UI_ListAdItem.Proxy(obj);
 
+            item.m_loaRes.url = "ui://Main/guanggao_" + _adIds[index].res;
+            if (item.m_loaRes.data == null)
+            {
+                item.m_loaRes.onClick.Add(OnBtnAdJump);
+            }
+            item.m_loaRes.data = _adIds[index].jumpId;
+
+            UI_ListAdItem.ProxyEnd();
+        }
+        private void OnBtnAdJump(EventContext context)
+        {
+            string jumpId = (context.sender as GObject).data.ToString();
+            ViewManager.Show($"GFGGame.{jumpId}");
+        }
+        private void OnListAdScrollEnd()
+        {
+            int itemIndex = _ui.m_comListAd.m_listAd.ChildIndexToItemIndex(0);
+            _ui.m_comListAd.m_listAdSelect.selectedIndex = itemIndex;
+        }
         private void CheckFunOpen()
         {
             _ui.m_btnXiuFang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);

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: