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

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

@@ -4,7 +4,7 @@
   <displayList>
     <image id="n3_qqhz" name="bagGrey" src="qqhzm" fileName="images/cz_an_grey.png" xy="0,0"/>
     <image id="n6_yjmk" name="bagYellow" src="yjmk2y" fileName="images/button.png" xy="0,0"/>
-    <text id="n1_qqhz" name="txtNewPrice" xy="146,2" size="104,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="12元"/>
+    <text id="n1_qqhz" name="txtNewPrice" xy="134,2" size="104,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="12元"/>
     <text id="n2_qqhz" name="txtOldPrice" xy="21,2" size="84,69" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="shrink" strike="true" text="86"/>
     <loader id="n5_yjmk" name="loaIcon" xy="104,22" size="38,34" fill="scale" shrinkOnly="true"/>
   </displayList>

FGUIProject/assets/EnduringGiftBox/components/BtnBuyPink.xml

@@ -5,7 +5,7 @@
     <image id="n7_yjmk" name="bagGrey" src="qqhzm" fileName="images/cz_an_grey.png" xy="0,7" size="316,75" aspect="true"/>
     <image id="n6_yjmk" name="bagPink" src="yjmk3b" fileName="images/an_pink.png" xy="0,7" size="316,75" aspect="true"/>
     <text id="n1_qqhz" name="txtNewPrice" xy="166,5" size="104,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="300元"/>
-    <text id="n2_qqhz" name="txtOldPrice" xy="37,5" size="84,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" strike="true" text="2000"/>
+    <text id="n2_qqhz" name="txtOldPrice" xy="47,5" size="84,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" align="right" vAlign="middle" autoSize="shrink" strike="true" text="2000"/>
     <loader id="n5_yjmk" name="loaIcon" xy="122,22" size="33,31" fill="scale" shrinkOnly="true"/>
   </displayList>
   <Button/>

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/components/ComCurSupplyItem.xml

@@ -10,7 +10,7 @@
     <component id="n28_qqhz" name="comLeftGiftBox" src="qqhz1q" fileName="components/ComLeftGiftBox.xml" xy="25,22"/>
     <text id="n15_qqhz" name="txtTitle" xy="290,15" size="275,47" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#cc9974" align="center" autoSize="none" text="体力超值返利包"/>
     <text id="n22_qqhz" name="txtWeekPrompt" xy="294,46" size="266,39" font="ui://eg2y0ldpa0cftks" fontSize="26" color="#bda5a8" align="center" autoSize="none" text="连续七天每日获得"/>
-    <image id="n23_qqhz" name="icoWeekPromptTag" src="qqhz1p" fileName="images/lm_tb_tishi.png" xy="530,48"/>
+    <component id="n29_droi" name="btnIcoWeekPromptTag" src="droi3e" fileName="components/BtnIcoWeekPromptTag.xml" xy="530,48"/>
     <list id="n18_qqhz" name="list" xy="231,83" size="402,132" layout="flow_vt" overflow="scroll" scroll="horizontal" scrollBarFlags="32" colGap="35" defaultItem="ui://bdi1qe15qqhz1g" align="center" autoClearItems="true">
       <item/>
     </list>

FGUIProject/assets/EnduringGiftBox/package.xml

@@ -40,7 +40,7 @@
     <component id="qqhz1g" name="ComRewardIconItem.xml" path="/components/" exported="true"/>
     <image id="qqhz1n" name="hlhdjficon.png" path="/images/" exported="true"/>
     <component id="qqhz1o" name="ComDiscount.xml" path="/components/" exported="true"/>
-    <image id="qqhz1p" name="lm_tb_tishi.png" path="/images/" exported="true"/>
+    <image id="qqhz1p" name="lm_tb_tishi.png" path="/images/"/>
     <component id="qqhz1q" name="ComLeftGiftBox.xml" path="/components/" exported="true"/>
     <component id="qqhz1r" name="ComGouMaiGetText.xml" path="/components/" exported="true"/>
     <image id="qqhz25" name="tili.png" path="/images/"/>
@@ -83,6 +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="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>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -20,13 +20,13 @@
       <gearDisplay controller="c1" pages="1"/>
       <Button title="领取" icon="ui://eg2y0ldpwm603f"/>
     </component>
-    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="204,63">
+    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="204,63">
       <gearDisplay controller="c1" pages="3"/>
       <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
-    <image id="n19_vnby" name="n19" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" pkg="eg2y0ldp" xy="844,47" group="n21_vnby"/>
-    <text id="n20_vnby" name="n20" xy="926,52" size="88,39" group="n21_vnby" fontSize="28" color="#683c28" text="已领取"/>
-    <group id="n21_vnby" name="n21" xy="844,47" size="233,51" advanced="true">
+    <image id="n19_vnby" name="n19" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" pkg="eg2y0ldp" xy="800,47" group="n21_vnby"/>
+    <text id="n20_vnby" name="n20" xy="882,52" size="88,39" group="n21_vnby" fontSize="28" color="#683c28" text="已领取"/>
+    <group id="n21_vnby" name="n21" xy="800,47" size="233,51" advanced="true">
       <gearDisplay controller="c1" pages="2"/>
     </group>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>

FGUIProject/assets/Task/components/BuyBattlePassLevelBt.xml

@@ -5,7 +5,7 @@
     <image id="n0_itts" name="n0" src="a0cf2d" fileName="imagesExport/lm_an.png" pkg="mk0fwx0x" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_itts" name="n1" src="a0cf2h" fileName="imagesNew/lm_tb.png" pkg="eg2y0ldp" xy="68,15"/>
+    <loader id="n1_itts" name="icon" xy="68,15" size="33,31" url="ui://eg2y0ldpa0cf2h" align="center" vAlign="middle"/>
     <text id="n2_itts" name="title" xy="111,6" size="110,48" fontSize="35" color="#915e15" align="center" vAlign="middle" autoSize="none" text=""/>
   </displayList>
   <Button/>

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

@@ -160,5 +160,18 @@ namespace GFGGame
             }
             return rs;
         }
+
+        public bool GetHadCanGetReward()
+        {
+            var battlePassLevel = GetBattlePassLevel();
+            var isBuy = GetIsBuy();
+            for (var i = 1; i < battlePassLevel; i++)
+            {
+                if (!NormalRewards.Contains(i)) return true;
+                if (!isBuy) continue;
+                if (!SuperRewards.Contains(i)) return true;
+            }
+            return false;
+        }
     }
 }

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using ET;
 
 namespace GFGGame
@@ -6,7 +7,6 @@ namespace GFGGame
     public class DailyTaskDataManager : SingletonBase<DailyTaskDataManager>
     {
         private Dictionary<int, int> _livenessBoxInfos = new Dictionary<int, int>();
-        // public Dictionary<int, int> LivenessBoxInfos => _livenessBoxInfos;
 
         public void Clear()
         {
@@ -64,5 +64,11 @@ namespace GFGGame
             var index = cfgs.Length - 1;
             return cfgs[index].count;
         }
+     
+        public bool GetHadGetRewardNum()
+        {
+            //TODO 可以缓存是否有领取的状态
+            return _livenessBoxInfos.Any(t => t.Value == ConstBonusStatus.CAN_GET);
+        }
     }
 }

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

@@ -72,7 +72,7 @@ namespace GFGGame
                 {
                     _travelSuitIDList.Add(travelSuitCfg.id);
                 }
-                if (SuitCfgArray.Instance.CheckSuitHasAction(value))
+                if (CheckSuitHasAction(value))
                 {
                     _actionIDList.Add(value);
                 }
@@ -89,7 +89,7 @@ namespace GFGGame
                 {
                     _travelSuitIDList.Remove(travelSuitCfg.id);
                 }
-                if (SuitCfgArray.Instance.CheckSuitHasAction(value) && _actionIDList.Contains(value))
+                if (CheckSuitHasAction(value) && _actionIDList.Contains(value))
                 {
                     _actionIDList.Remove(travelSuitCfg.id);
                 }
@@ -250,5 +250,12 @@ namespace GFGGame
             EventAgent.DispatchEvent(ConstMessage.SUIT_BOX_STATUS_CHANGED, suitId);
         }
 
+        //检查套装是否有动作
+        public static bool CheckSuitHasAction(int suitId)
+        {
+            var suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            return suitCfg != null && ResPathUtil.CheckDressUpAnimationExist(suitCfg.aniRes);
+        }
+
     }
 }

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

@@ -25,7 +25,7 @@ namespace GFGGame
             _ltgGbItemData4.Clear();
             _ltgGbItemData5.Clear();
         }
-        
+
         public void UpLtgGbItemData3()
         {
             _ltgGbItemData3.Clear();
@@ -51,6 +51,8 @@ namespace GFGGame
                             _ltgGbItemData3.FirstOrDefault(a => a.IndexType == shopCfg.menu2);
                         if (ltgGbItemData != null)
                         {
+                            var index = _ltgGbItemData3.IndexOf(ltgGbItemData);
+                            ltgGbItemData.EndTime = activityInfo.endTime;
                             if (ltgGbItemData.ShopCfgIds != null)
                             {
                                 if (ltgGbItemData.ShopCfgIds.Count < 3)
@@ -63,8 +65,7 @@ namespace GFGGame
                                 ltgGbItemData.ShopCfgIds = new List<int> { shopCfgId };
                             }
 
-                            ltgGbItemData.EndTime = activityInfo.endTime;
-                            _ltgGbItemData3.Add(ltgGbItemData);
+                            _ltgGbItemData3[index] = ltgGbItemData;
                         }
                         else
                         {

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using ET;
 
 namespace GFGGame
@@ -19,6 +20,7 @@ namespace GFGGame
             }
             return false;
         }
+
         /// <summary>
         /// 任务
         /// 是否有任务奖励、任务宝箱奖励可领
@@ -26,18 +28,21 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetTaskRed()
         {
-            //TODO
-            // Dictionary<int, TaskInfo> taskInfo = TaskDataManager.TaskInfo;
-            // foreach (int key in taskInfo.Keys)
-            // {
-            //     if (DailyTaskDataManager.Instance.GetTaskStateById(key) == ConstBonusStatus.CAN_GET) return true;
-            // }
-            // Dictionary<int, int> livenessBoxInfos = DailyTaskDataManager.Instance.LivenessBoxInfos;
-            // foreach (int key in livenessBoxInfos.Keys)
-            // {
-            //     if (DailyTaskDataManager.Instance.GetBoxStateById(key) == ConstBonusStatus.CAN_GET) return true;
-            // }
-            return false;
+            //判断活跃奖励是否有可以领取
+            var hadGetRewardNum = DailyTaskDataManager.Instance.GetHadGetRewardNum();
+            if (hadGetRewardNum) return true;
+            var taskInfos = TaskDataManager.Instance.GetTaskInfos(TaskType.Daily);
+            if (taskInfos.Select(taskInfo => taskInfo.Value).Any(info => info.State == ConstBonusStatus.CAN_GET))
+            {
+                return true;
+            }
+            taskInfos = TaskDataManager.Instance.GetTaskInfos(TaskType.BattlePass);
+            if (taskInfos.Select(taskInfo => taskInfo.Value).Any(info => info.State == ConstBonusStatus.CAN_GET))
+            {
+                return true;
+            }
+            //判断是否有通行证奖励可领取
+            return BattlePassTaskDataManager.Instance.GetHadCanGetReward();
         }
 
         /// <summary>
@@ -48,6 +53,7 @@ namespace GFGGame
         {
             return ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET;
         }
+
         /// <summary>
         /// 有邮件未读或未领奖励
         /// </summary>
@@ -65,7 +71,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetFieldGuideRed()
         {
-            List<int> _suitIds = SuitUtil.GetSuitIdList(false, true, 0, 3);//全部已获得套装按照收集度高排序
+            List<int> _suitIds = SuitUtil.GetSuitIdList(false, true, 0, 3); //全部已获得套装按照收集度高排序
             for (int i = 0; i < _suitIds.Count; i++)
             {
                 int status = DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(_suitIds[i]);
@@ -102,6 +108,7 @@ namespace GFGGame
         {
             return GetFriendApplyRed() || GetFriendGiftRed();
         }
+
         /// <summary>
         /// 是否有好友申请
         /// </summary>
@@ -110,6 +117,7 @@ namespace GFGGame
         {
             return FriendDataManager.Instance.ApplyDatas.Count > 0;
         }
+
         /// <summary>
         /// 是否有好友可领体力
         /// </summary>
@@ -147,6 +155,7 @@ namespace GFGGame
             // }
             return false;
         }
+
         /// <summary>
         /// 田野调查红点
         /// </summary>
@@ -161,6 +170,7 @@ namespace GFGGame
             }
             return false;
         }
+
         /// <summary>
         /// 工作室红点
         /// </summary>
@@ -192,7 +202,8 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetTravelGuideRed()
         {
-            if (TravelDataManager.Instance.ListTravelAreaRewardState == null || TravelDataManager.Instance.ListTravelAreaRewardState.Count == 0) return false;
+            if (TravelDataManager.Instance.ListTravelAreaRewardState == null ||
+                TravelDataManager.Instance.ListTravelAreaRewardState.Count == 0) return false;
             for (int i = 0; i < TravelDataManager.Instance.ListTravelAreaRewardState.Count; i++)
             {
                 if (TravelDataManager.Instance.ListTravelAreaRewardState[i] == ConstBonusStatus.CAN_GET)
@@ -202,6 +213,7 @@ namespace GFGGame
             }
             return false;
         }
+
         /// <summary>
         /// 千山万水-图鉴区域红点
         /// </summary>
@@ -209,9 +221,9 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetTravelGuideAreaRed(int areaId)
         {
-            if (TravelDataManager.Instance.ListTravelAreaRewardState == null || TravelDataManager.Instance.ListTravelAreaRewardState.Count == 0) return false;
+            if (TravelDataManager.Instance.ListTravelAreaRewardState == null ||
+                TravelDataManager.Instance.ListTravelAreaRewardState.Count == 0) return false;
             return TravelDataManager.Instance.GetGuideRewardStateByAreaId(areaId) == ConstBonusStatus.CAN_GET;
-
         }
 
         /// <summary>
@@ -222,6 +234,7 @@ namespace GFGGame
         {
             return RoleInfoManager.Instance.newHeadDatas.Count > 0;
         }
+
         /// <summary>
         /// 头像-获得新头像框红点
         /// </summary>
@@ -253,12 +266,13 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetCardSkillRed(int skillId)
         {
-
             PassivitySkillCfg skillCfg = PassivitySkillCfgArray.Instance.GetCfg(skillId);
             int skillLv = SkillDataManager.Instance.GetCardSkillLv(skillCfg.cardId, skillId);
 
-            PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillId);
-            PassivitySkillLvlCfg nextSkillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv + 1, skillId);
+            PassivitySkillLvlCfg skillLvlCfg =
+                PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillId);
+            PassivitySkillLvlCfg nextSkillLvlCfg =
+                PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv + 1, skillId);
             if (nextSkillLvlCfg == null || skillLvlCfg.materiarsArr.Length == 0) return false;
             long itemHas = ItemDataManager.GetItemNum(skillLvlCfg.materiarsArr[0][0]);
             int itemNeed = skillLvlCfg.materiarsArr[0][1];
@@ -267,6 +281,7 @@ namespace GFGGame
             int costNeed = skillLvlCfg.costNum;
             return itemHas >= itemNeed && costHas >= costNeed;
         }
+
         //卡牌-卡牌升星奖励状态
         public bool GetCardStarReward(int cardId)
         {
@@ -274,10 +289,11 @@ namespace GFGGame
             List<CardStarCfg> cardStarCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(cardId);
             for (int i = 0; i < cardStarCfgs.Count; i++)
             {
-                if (cardStarCfgs[i].rewardsArr.Length > 0 && cardData.starRewardsState.ContainsKey(cardStarCfgs[i].starLvl) && cardData.starRewardsState[cardStarCfgs[i].starLvl] == ConstBonusStatus.CAN_GET) return true;
+                if (cardStarCfgs[i].rewardsArr.Length > 0 &&
+                    cardData.starRewardsState.ContainsKey(cardStarCfgs[i].starLvl) &&
+                    cardData.starRewardsState[cardStarCfgs[i].starLvl] == ConstBonusStatus.CAN_GET) return true;
             }
             return false;
-
         }
 
         /// <summary>
@@ -310,11 +326,13 @@ namespace GFGGame
 
             for (int i = 1; i < vipCfgs.Length; i++)
             {
-                bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfgs[i].id);
+                bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus),
+                    vipCfgs[i].id);
                 if (!isGet && RoleDataManager.vipLv >= vipCfgs[i].id) return true;
             }
 
-            return GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv > 0;
+            return GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 &&
+                   RoleDataManager.vipLv > 0;
         }
     }
 }

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.CheckSuitHasAction(_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)
@@ -538,8 +527,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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/EnduringGiftBox/UI_ComCurSupplyItem.cs

@@ -14,7 +14,7 @@ namespace UI.EnduringGiftBox
         public UI_ComLeftGiftBox m_comLeftGiftBox;
         public GTextField m_txtTitle;
         public GTextField m_txtWeekPrompt;
-        public GImage m_icoWeekPromptTag;
+        public GComponent m_btnIcoWeekPromptTag;
         public GList m_list;
         public const string URL = "ui://bdi1qe15qqhz11";
         public const string PACKAGE_NAME = "EnduringGiftBox";
@@ -70,7 +70,7 @@ namespace UI.EnduringGiftBox
             m_comLeftGiftBox = (UI_ComLeftGiftBox)UI_ComLeftGiftBox.Create(comp.GetChild("comLeftGiftBox"));
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtWeekPrompt = (GTextField)comp.GetChild("txtWeekPrompt");
-            m_icoWeekPromptTag = (GImage)comp.GetChild("icoWeekPromptTag");
+            m_btnIcoWeekPromptTag = (GComponent)comp.GetChild("btnIcoWeekPromptTag");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
@@ -85,7 +85,7 @@ namespace UI.EnduringGiftBox
             m_comLeftGiftBox = null;
             m_txtTitle = null;
             m_txtWeekPrompt = null;
-            m_icoWeekPromptTag = null;
+            m_btnIcoWeekPromptTag = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/EnduringGiftBox/UI_RushSaleGiftBoxUI.cs

@@ -7,6 +7,9 @@ namespace UI.EnduringGiftBox
     public partial class UI_RushSaleGiftBoxUI
     {
         public GComponent target;
+        public GComponent m_btnUp;
+        public GComponent m_btnNext;
+        public GComponent m_btnBack;
         public GTextField m_txtBoxItemName;
         public GTextField m_txtBoxResidueTime;
         public GList m_list;
@@ -14,9 +17,7 @@ namespace UI.EnduringGiftBox
         public UI_BtnBuyPink m_btnBuyPink;
         public UI_ComDiscount2 m_comDiscount;
         public GTextField m_txtLrc;
-        public GComponent m_btnUp;
-        public GComponent m_btnNext;
-        public GComponent m_btnBack;
+        public Transition m_t3;
         public const string URL = "ui://bdi1qe15yjmk29";
         public const string PACKAGE_NAME = "EnduringGiftBox";
         public const string RES_NAME = "RushSaleGiftBoxUI";
@@ -64,6 +65,9 @@ namespace UI.EnduringGiftBox
 
         private void Init(GComponent comp)
         {
+            m_btnUp = (GComponent)comp.GetChild("btnUp");
+            m_btnNext = (GComponent)comp.GetChild("btnNext");
+            m_btnBack = (GComponent)comp.GetChild("btnBack");
             m_txtBoxItemName = (GTextField)comp.GetChild("txtBoxItemName");
             m_txtBoxResidueTime = (GTextField)comp.GetChild("txtBoxResidueTime");
             m_list = (GList)comp.GetChild("list");
@@ -71,12 +75,13 @@ namespace UI.EnduringGiftBox
             m_btnBuyPink = (UI_BtnBuyPink)UI_BtnBuyPink.Create(comp.GetChild("btnBuyPink"));
             m_comDiscount = (UI_ComDiscount2)UI_ComDiscount2.Create(comp.GetChild("comDiscount"));
             m_txtLrc = (GTextField)comp.GetChild("txtLrc");
-            m_btnUp = (GComponent)comp.GetChild("btnUp");
-            m_btnNext = (GComponent)comp.GetChild("btnNext");
-            m_btnBack = (GComponent)comp.GetChild("btnBack");
+            m_t3 = comp.GetTransition("t3");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnUp = null;
+            m_btnNext = null;
+            m_btnBack = null;
             m_txtBoxItemName = null;
             m_txtBoxResidueTime = null;
             m_list = null;
@@ -86,9 +91,7 @@ namespace UI.EnduringGiftBox
             m_comDiscount.Dispose();
             m_comDiscount = null;
             m_txtLrc = null;
-            m_btnUp = null;
-            m_btnNext = null;
-            m_btnBack = null;
+            m_t3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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/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/Bag/BagView.cs

@@ -103,26 +103,24 @@ namespace GFGGame
             GComponent comItem = (context.data as GComponent);
             ItemCfg itemCfg = comItem.data as ItemCfg;
 
-            //区分一下道具跟礼包
-            if (itemCfg.itemType == ConstItemType.ITEM)
+            //可使用物品
+            if (itemCfg.itemType == ConstItemType.USEABLE)
             {
-                if (itemCfg.subType == 0)
+                if (itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE)
                 {
-                    object[] sourceDatas = new object[]
-                        { itemCfg.id, new object[] { typeof(BagView).FullName, this.viewData } };
-                    GoodsItemTipsController.ShowItemTips(itemCfg.id, sourceDatas);
+                    ViewManager.Show<GiftBoxSelectorView>(itemCfg.id);
                 }
-                else if (itemCfg.subType == 1)
+                else
                 {
+                    //暂时程序走不到这里,这里是以前用来使用物品的一个界面---20230607--hxj注释
                     ViewManager.Show<BagExchangeView>(itemCfg.id);
                 }
             }
             else
             {
-                //ConstItemType.GIFT_BAG 礼包
-                //随机礼包--还未有该需求,但是配置表有了,先不管,之后有随机礼包需求可以在这里加判断处理
-                //自选礼包
-                ViewManager.Show<GiftBoxSelectorView>(itemCfg.id);
+                object[] sourceDatas = new object[]
+                    { itemCfg.id, new object[] { typeof(BagView).FullName, this.viewData } };
+                GoodsItemTipsController.ShowItemTips(itemCfg.id, sourceDatas);
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/Bag/GiftBoxSelectorView.cs

@@ -134,7 +134,7 @@ namespace GFGGame
                 longPressGesture.once = false;
                 longPressGesture.onAction.Add(OnLongPress);
                 _listLongPress.Add(longPressGesture);
-                
+
                 LongPressGesture longPressGesture2 = new LongPressGesture(uiItemChild.m_btnReduce);
                 longPressGesture2.trigger = 0.3f;
                 longPressGesture2.interval = 0.1f;
@@ -200,7 +200,7 @@ namespace GFGGame
 
             SetSelAllNum();
         }
-        
+
         private void OnChildBtnReduceClick(EventContext context)
         {
             GObject sender = context.sender as GObject;
@@ -221,7 +221,7 @@ namespace GFGGame
             ItemCfg itemCfg = obj.data as ItemCfg;
             UpdateReduceSel(listItem, itemCfg);
         }
-        
+
         private void UpdateReduceSel(UI_ListSelectorItem listItem, ItemCfg itemCfg)
         {
             if (_selCount == 0)
@@ -233,7 +233,7 @@ namespace GFGGame
             {
                 return;
             }
-            
+
             if (_selDic.TryGetValue(itemCfg.id, out int num))
             {
                 if (num == 0)
@@ -259,7 +259,7 @@ namespace GFGGame
         {
             _ui.m_txtSelRewardStr.text = $"已选奖励：{_selCount}/{_count}";
         }
-        
+
         //弹出物品详细描述框
         private void OnListSelectorItemClick(EventContext context)
         {
@@ -279,17 +279,24 @@ namespace GFGGame
         {
             List<GiftBoxSelChildItemProto> reqItemList = new List<GiftBoxSelChildItemProto>();
 
-            foreach (var itemKv in _selDic)
+            if (_selDic.Keys.Count > 0)
             {
-                reqItemList.Add(new GiftBoxSelChildItemProto
+                foreach (var itemKv in _selDic)
                 {
-                    ChildItemId = itemKv.Key,
-                    ChildItemCount = itemKv.Value
-                });
-            }
+                    reqItemList.Add(new GiftBoxSelChildItemProto
+                    {
+                        ChildItemId = itemKv.Key,
+                        ChildItemCount = itemKv.Value
+                    });
+                }
 
-            ItemProxy.ReqUseGiftBoxSelItem(_itemId, reqItemList).Coroutine();
-            this.Hide();
+                ItemProxy.ReqUseGiftBoxSelItem(_itemId, reqItemList).Coroutine();
+                this.Hide();
+            }
+            else
+            {
+                PromptController.Instance.ShowFloatTextPrompt("请先选择");
+            }
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -271,7 +271,7 @@ namespace GFGGame
             // bool isSuit = SuitCfgArray.Instance.GetTotalCountOfOneSuit(id) > 0;
             if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
             {
-                if (SuitCfgArray.Instance.CheckSuitHasAction(id))
+                if (DressUpMenuSuitDataManager.CheckSuitHasAction(id))
                 {
                     listItem.m_comAxtionSelect.target.visible = true;
                     UI_PartsListItem.ProxyEnd();
@@ -813,7 +813,7 @@ namespace GFGGame
                 if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
                 {
                     listItem.m_iconSelected.visible = suitId > 0 && id == suitId;
-                    listItem.m_comAxtionSelect.target.visible = id == selectSuitId && SuitCfgArray.Instance.CheckSuitHasAction(id);
+                    listItem.m_comAxtionSelect.target.visible = id == selectSuitId && DressUpMenuSuitDataManager.CheckSuitHasAction(id);
                 }
                 else if (_currentMenuType == ConstDressUpItemType.DONG_ZUO)
                 {

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -177,6 +177,7 @@ namespace GFGGame
             _ui.m_list.visible = true;
         }
 
+        // ReSharper disable Unity.PerformanceAnalysis
         private void ListItemRender(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgList[index];
@@ -187,11 +188,11 @@ namespace GFGGame
             //返利包
             item.m_txtTitle.text = itemCfg.name;
             item.m_txtWeekPrompt.visible = false;
-            item.m_icoWeekPromptTag.visible = false;
+            item.m_btnIcoWeekPromptTag.visible = false;
             if (itemCfg.param2Arr.Length != 0)
             {
                 item.m_txtWeekPrompt.visible = true;
-                item.m_icoWeekPromptTag.visible = true;
+                item.m_btnIcoWeekPromptTag.visible = true;
                 item.m_txtWeekPrompt.text = string.Format("连续{0}天每日获得", itemCfg.param2Arr[0]);
             }
 
@@ -246,7 +247,7 @@ namespace GFGGame
                 item.m_txtUrc.text = string.Format("今日剩余{0}/{1}", remainBuyNum, shopCfg.maxBuyNum);
                 item.m_txtLrc.text = string.Format("可获得{0}会员积分", shopCfg.price * 10);
                 item.m_txtWeekPrompt.visible = false;
-                item.m_icoWeekPromptTag.visible = false;
+                item.m_btnIcoWeekPromptTag.visible = false;
                 numItems = childItemCfg.itemsArr.Length;
 
                 if (remainBuyNum == 0)
@@ -288,7 +289,7 @@ namespace GFGGame
                 item.m_txtWeekPrompt.text =
                     string.Format("连续{0}天每日获得",
                         itemCfg.param2Arr[0] + 1); //NumberUtil.GetChiniseNumberText(itemCfg.param2Arr[0])
-                item.m_icoWeekPromptTag.visible = true;
+                item.m_btnIcoWeekPromptTag.visible = true;
 
                 numItems = childItemCfg.param1Arr.Length;
 
@@ -334,8 +335,8 @@ namespace GFGGame
                 }
             }
 
-            item.m_icoWeekPromptTag.onClick.Add(RuleController.ShowRuleView);
-            item.m_icoWeekPromptTag.data = 300013;
+            item.m_btnIcoWeekPromptTag.onClick.Add(RuleController.ShowRuleView);
+            item.m_btnIcoWeekPromptTag.data = 300013;
             //领取按钮点击事件
             item.m_btnCurReceive.target.onClick.Add(OnBtnCurReceiveClick);
             //购买按钮点击事件
@@ -347,6 +348,7 @@ namespace GFGGame
         }
 
         //领取按钮点击事件
+        // ReSharper disable Unity.PerformanceAnalysis
         private void OnBtnCurReceiveClick(EventContext context)
         {
             GObject sender = context.sender as GObject;
@@ -365,6 +367,7 @@ namespace GFGGame
         }
 
         //购买按钮点击事件
+        // ReSharper disable Unity.PerformanceAnalysis
         private void OnBtnBuyClick(EventContext context)
         {
             GObject sender = context.sender as GObject;
@@ -396,6 +399,7 @@ namespace GFGGame
             }
         }
 
+        // ReSharper disable Unity.PerformanceAnalysis
         private void ChildListItemRender(int index, GObject obj)
         {
             UI_ComRewardIconItem uiItemChild = UI_ComRewardIconItem.Proxy(obj);
@@ -450,6 +454,8 @@ namespace GFGGame
             GoodsItemTipsController.ShowItemTips(itemCfg.id);
         }
 
+        // ReSharper disable Unity.PerformanceAnalysis
+        // ReSharper disable Unity.PerformanceAnalysis
         private async void OnClickBtnSure()
         {
             if (_maxTimes > 0 && (_buyTimes + _count) > _maxTimes)
@@ -504,6 +510,7 @@ namespace GFGGame
         }
 
         //购买连续礼包之后，更新数据+更新界面
+        // ReSharper disable Unity.PerformanceAnalysis
         private void UpDayRebateAndView(EventContext context)
         {
             ShopCfg shopCfg = context.data as ShopCfg;

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/RushSaleGiftBoxView.cs

@@ -185,13 +185,14 @@ namespace GFGGame
                 mTxtNewPrice = shopCfg.price.ToString();
                 _ui.m_btnBuyPink.m_loaIcon.visible = true;
                 _ui.m_btnBuyPink.m_loaIcon.url = ResPathUtil.GetIconPath(costCfg);
+                //_ui.m_btnBuyPink.m_txtNewPrice.x = 166;
             }
             else if (shopCfg.costType == CostType.RMB)
             {
                 //人民币
                 mTxtNewPrice = $"{shopCfg.price}元";
-                _ui.m_btnBuyPink.m_txtNewPrice.align = AlignType.Left;
-                _ui.m_btnBuyPink.m_txtNewPrice.x = 90;
+                //_ui.m_btnBuyPink.m_txtNewPrice.align = AlignType.Left;
+                //_ui.m_btnBuyPink.m_txtNewPrice.x = 166;
                 _ui.m_txtLrc.text = $"可获得{shopCfg.price * 10}充值经验";
             }
             else
@@ -199,8 +200,8 @@ namespace GFGGame
                 //免费
                 mTxtNewPrice = $"免费";
                 _ui.m_btnBuyPink.m_txtOldPrice.text = "";
-                _ui.m_btnBuyPink.m_txtNewPrice.align = AlignType.Left;
-                _ui.m_btnBuyPink.m_txtNewPrice.x = 90;
+                //_ui.m_btnBuyPink.m_txtNewPrice.align = AlignType.Left;
+                // _ui.m_btnBuyPink.m_txtNewPrice.x = 166;
             }
 
             _ui.m_txtBoxItemName.text = shopCfg.itemName;

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/SpecialOfferGiftBoxView.cs

@@ -154,15 +154,19 @@ namespace GFGGame
             string mTxtNewPrice;
             if (shopCfg.refreshType == RefreshType.DAY)
             {
-                mTxtUrc = $"今日限购{remainBuyNum}/{shopCfg.maxBuyNum}";
+                mTxtUrc = $"每日限购{remainBuyNum}/{shopCfg.maxBuyNum}";
             }
             else if (shopCfg.refreshType == RefreshType.WEEK)
             {
-                mTxtUrc = $"本周限购{remainBuyNum}/{shopCfg.maxBuyNum}";
+                mTxtUrc = $"每周限购{remainBuyNum}/{shopCfg.maxBuyNum}";
             }
             else if (shopCfg.refreshType == RefreshType.MONTH)
             {
-                mTxtUrc = $"本月限购{remainBuyNum}/{shopCfg.maxBuyNum}";
+                mTxtUrc = $"每月限购{remainBuyNum}/{shopCfg.maxBuyNum}";
+            }
+            else
+            {
+                mTxtUrc = $"永久限购{remainBuyNum}/{shopCfg.maxBuyNum}";
             }
 
             if (remainBuyNum == 0)
@@ -184,6 +188,8 @@ namespace GFGGame
                 ItemCfg costCfg = ItemCfgArray.Instance.GetCfg(shopCfg.costId);
                 mTxtNewPrice = shopCfg.price.ToString();
                 uiItem.m_btnBuy.m_loaIcon.visible = true;
+                uiItem.m_btnBuy.m_txtNewPrice.x = 134;
+                uiItem.m_btnBuy.m_txtOldPrice.x = 21;
                 uiItem.m_btnBuy.m_loaIcon.url = ResPathUtil.GetIconPath(costCfg);
             }
             else if (shopCfg.costType == CostType.RMB)
@@ -191,7 +197,8 @@ namespace GFGGame
                 //人民币 
                 mTxtNewPrice = $"{shopCfg.price}元";
                 uiItem.m_btnBuy.m_txtNewPrice.align = AlignType.Left;
-                uiItem.m_btnBuy.m_txtNewPrice.x = 90;
+                uiItem.m_btnBuy.m_txtNewPrice.x = 125;
+                uiItem.m_btnBuy.m_txtOldPrice.x = 30;
                 uiItem.m_txtGetJf.text = $"可获得{shopCfg.price * 10}充值经验";
             }
             else
@@ -200,14 +207,16 @@ namespace GFGGame
                 mTxtNewPrice = $"免费";
                 uiItem.m_btnBuy.m_txtOldPrice.text = "";
                 uiItem.m_btnBuy.m_txtNewPrice.align = AlignType.Left;
-                uiItem.m_btnBuy.m_txtNewPrice.x = 90;
+                uiItem.m_btnBuy.m_txtNewPrice.x = 125;
+                uiItem.m_btnBuy.m_txtOldPrice.x = 30;
             }
 
             uiItem.target.data = shopCfg;
             uiItem.m_btnBuy.m_txtNewPrice.text = mTxtNewPrice;
             uiItem.m_txtUrc.text = mTxtUrc;
             uiItem.m_btnBuy.target.onClick.Add(OnBtnBuyClick);
-
+            uiItem.m_txtBoxItemName.text = shopCfg.itemName;
+            
             //子列表
             uiItem.m_list.itemRenderer = ChildListItemRender;
             uiItem.m_list.numItems = shopItemCfg.itemsArr.Length;

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

@@ -722,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;
             }
         }
 
@@ -739,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;
             }
         }
 
@@ -819,12 +821,13 @@ namespace GFGGame
 
         private void OnNumericChange(EventContext context)
         {
-            if ((int)context.data == NumericType.Lvl)
+            var numericType = (int)context.data;
+            if (numericType == NumericType.Lvl)
             {
                 UpdateRoleLvl();
                 CheckFunOpen();
             }
-            if ((int)context.data == NumericType.FirstRechargeBonusStatus)
+            if (numericType == NumericType.FirstRechargeBonusStatus || numericType == NumericType.RechargeTotal)
             {
                 UpdateBtnFirstRecharge();
             }
@@ -833,6 +836,11 @@ namespace GFGGame
         private void UpdateBtnFirstRecharge()
         {
             _ui.m_btnFirstRecharge.target.visible = ActivityDataManager.Instance.firstChargeBonusStatus != ConstBonusStatus.GOT;
+            if(_ui.m_btnFirstRecharge.target.visible)
+            {
+                bool canget = ActivityDataManager.Instance.firstChargeBonusStatus == ConstBonusStatus.CAN_GET;
+                RedDotController.Instance.SetComRedDot(_ui.m_btnFirstRecharge.target, canget);
+            }
         }
 
         private void UpdateRoleLvl()

GameClient/Assets/Game/HotUpdate/Views/Task/BuyBattlePassLevelView.cs

@@ -29,6 +29,10 @@ namespace GFGGame
             _ui.m_CloseBtn.onClick.Add(Hide);
             // clickBlankToClose = false;
             _ui.m_Rewards.itemRenderer = SpecialRewardRender;
+            var globalCfgBattlePassLevelConsumeArr = GlobalCfgArray.globalCfg.BattlePassLevelConsumeArr;
+            _ui.m_AddLevelBtn.icon =
+                ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(globalCfgBattlePassLevelConsumeArr[0][0])
+                    .res);
             _ui.m_Add.onClick.Add(OnAddLevel);
             _ui.m_Reduce.onClick.Add(OnReduceLevel);
             _ui.m_AddLevelBtn.onClick.Add(OnRequestAddLevel);

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: