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

* 'master' of http://10.108.64.190:3000/gfg/Client: (24 commits)
  限时礼包-跑通
  战斗卡牌报错
  竞技场未开启不飘字提示
  限时累充提示
  会员套装展示
  限时累充
  商店
  抽奖奖励展示
  雅集答题报错
  限时礼包
  限时累充
  选择卡牌报错
  换装引导
  限时累充
  限时累充
  item改名
  卡牌升级提示
  限时礼包更换枚举
  限时礼包
  限时礼包
  ...

FGUIProject/assets/Bag/components/BtnSub.xml

@@ -5,7 +5,7 @@
     <image id="n0_cu9w" name="n0" src="v5notlz" fileName="images/lm_an__xuanzhong_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_cu9w" name="title" xy="0,0" size="265,82" font="SourceHanSerifCN-Regular" fontSize="32" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="使用">
+    <text id="n1_cu9w" name="title" xy="0,0" size="265,82" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="使用">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Bag/components/ListSelectorItem.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="172,241" overflow="hidden">
   <displayList>
-    <image id="n0_v5no" name="n0" src="v5notm7" fileName="images/wpk_db_1_da.png" xy="0,1"/>
     <image id="n2_v5no" name="n2" src="v5notmc" fileName="images/db_jiajian_1.png" xy="23,189"/>
     <text id="n17_cu9w" name="txtSelNum" xy="56,184" size="60,53" fontSize="39" color="#915e15" align="center" autoSize="none" text="0"/>
-    <loader id="n11_v5no" name="loaIcon" xy="87,84" pivot="0.5,0.5" anchor="true" size="100,88" fill="scale"/>
-    <image id="n18_qqhz" name="n18" src="v5notm8" fileName="images/wpk_sz_db_1.png" xy="8,120" size="155,45"/>
-    <text id="n19_qqhz" name="txtNum" xy="58,122" size="54,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="120"/>
     <component id="n15_cu9w" name="btnReduce" src="cu9wtmf" fileName="components/BtnReduce.xml" xy="-1,188"/>
     <component id="n16_cu9w" name="btnAdd" src="cu9wtmg" fileName="components/BtnAdd.xml" xy="121,189"/>
+    <image id="n0_v5no" name="n0" src="v5notm7" fileName="images/wpk_db_1_da.png" xy="0,1" group="n20_yjmk"/>
+    <loader id="n11_v5no" name="loaIcon" xy="87,84" pivot="0.5,0.5" anchor="true" size="100,88" group="n20_yjmk" fill="scale"/>
+    <image id="n18_qqhz" name="n18" src="v5notm8" fileName="images/wpk_sz_db_1.png" xy="8,120" size="155,45" group="n20_yjmk"/>
+    <text id="n19_qqhz" name="txtNum" xy="58,122" size="54,42" group="n20_yjmk" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="120"/>
+    <group id="n20_yjmk" name="n20" xy="0,1" size="172,172"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/ComIcon003.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180">
+  <displayList>
+    <image id="n25_pu55" name="n25" src="hhx9j" fileName="imagesNew/wp_baseboard1.png" xy="1,1"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="89,94" pivot="0.5,0.5" anchor="true" size="122,122" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="90,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="115,38" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="8,73" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="-1,73" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="32,37" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="46,68" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="32,37" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="-1,33" size="178,228"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -88,7 +88,7 @@
     <image id="9cth90" name="cj_hd_zik.png" path="/imagesExport/"/>
     <component id="ojlzk" name="ListScoreItem.xml" path="/components/" exported="true"/>
     <component id="ih7596" name="ComFilterType.xml" path="/components/" exported="true"/>
-    <component id="j48o98" name="ComItem.xml" path="/components/" exported="true"/>
+    <component id="j48o98" name="ComItem000.xml" path="/components/" exported="true"/>
     <image id="j48o99" name="kp_sjsj_di_3.png" path="/images/" exported="true"/>
     <image id="j48o9a" name="kp_sjsj_di_4.png" path="/images/" exported="true" scale="9grid" scale9grid="68,7,20,14"/>
     <image id="j48o9b" name="yx_yilq.png" path="/images/"/>
@@ -176,7 +176,7 @@
     <image id="orsttis" name="pfjl_ywc.png" path="/images/" exported="true"/>
     <image id="orsttit" name="wpbb_di.png" path="/images/" exported="true"/>
     <image id="pu55tiw" name="pfjl_and.png" path="/images/"/>
-    <component id="ng0itiz" name="ComItemIcon.xml" path="/components/"/>
+    <component id="ng0itiz" name="ComIcon000.xml" path="/components/"/>
     <image id="qqattj1" name="zjm_kuang_2.png" path="/images/"/>
     <image id="qqattj2" name="zjm_gnkuang.png" path="/images/"/>
     <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
@@ -276,8 +276,8 @@
     <image id="a0cf2l" name="lm_huizhangdk.png" path="/imagesNew/"/>
     <component id="o9ghtlr" name="ComHeadLv1.xml" path="/components/" exported="true"/>
     <image id="a0cf2k" name="lm_db_lvl.png" path="/imagesNew/"/>
-    <component id="9jv6tls" name="ComItemNew.xml" path="/components/" exported="true"/>
-    <component id="9jv6tlt" name="ComItemIconNew.xml" path="/components/"/>
+    <component id="9jv6tls" name="ComItem001_2.xml" path="/components/" exported="true"/>
+    <component id="9jv6tlt" name="ComIcon001.xml" path="/components/"/>
     <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
     <image id="miy37t" name="tb_suo.png" path="/imagesNew/" exported="true"/>
     <component id="rv091p" name="BtnStyle1Big.xml" path="/components/" exported="true"/>
@@ -300,8 +300,8 @@
     <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/" exported="true"/>
-    <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
-    <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/" exported="true"/>
+    <component id="qik1tly" name="ComItem002.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComIcon002.xml" path="/components/" exported="true"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
@@ -324,7 +324,7 @@
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
-    <component id="mdmdtn5" name="ComItemBlue.xml" path="/components/" exported="true"/>
+    <component id="mdmdtn5" name="ComItem001_1.xml" path="/components/" exported="true"/>
     <image id="uxxstma" name="wpk_db_2.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstm5" name="wpk_sz_db2.png" path="/imagesNew/" exported="true"/>
     <image id="mbf14" name="sj_dk.png" path="/imagesNew/" exported="true"/>
@@ -340,6 +340,7 @@
     <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
     <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
+    <component id="volstnd" name="ComIcon003.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/LimitChargeUI.xml

@@ -11,7 +11,8 @@
       <relation target="" sidePair="top-top"/>
     </group>
     <image id="n8_idkd" name="n8" src="nyhm8" fileName="imagesNew/qrhd_db.png" pkg="eg2y0ldp" xy="0,791" group="n12_idkd"/>
-    <list id="n1_fqor" name="list" xy="15,974" size="1040,946" group="n12_idkd" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://t8nwuj7iidkd15">
+    <text id="n13_vols" name="n13" xy="186,912" size="708,44" group="n12_idkd" fontSize="32" color="#bc8d49" text="活动期间累充达到指定会员积分即可领取绝版套装"/>
+    <list id="n1_fqor" name="list" xy="15,979" size="1040,941" group="n12_idkd" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://t8nwuj7iidkd15">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/DressUp/components/Button15.xml

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="119,119" extention="Button">
+<component size="105,105" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ygap" name="n0" src="ygapeo" fileName="images/hz_qhdzfz.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <loader id="n1_ygap" name="icon" xy="12,12" size="95,95" aspect="true" url="ui://mbo439wbygaper" fill="scaleFree">
-      <relation target="" sidePair="width-width,height-height"/>
-    </loader>
+    <image id="n0_ygap" name="n0" src="ygapeo" fileName="images/hz_qhdzfz.png" xy="-7,-7" group="n2_vols"/>
+    <loader id="n1_ygap" name="icon" xy="12,12" size="81,81" group="n2_vols" aspect="true" url="ui://mbo439wbygaper" fill="scaleFree"/>
+    <group id="n2_vols" name="n2" xy="-7,-7" size="119,119"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/DressUp/components/ComActionSelect.xml

@@ -2,8 +2,8 @@
 <component size="228,192">
   <displayList>
     <image id="n12_ygap" name="n12" src="ygapen" fileName="images/hz_hzhzmbmb.png" xy="18,0"/>
-    <component id="n13_ygap" name="btnNormal" src="ygapep" fileName="components/Button15.xml" xy="0,53" group="n18_ygap" aspect="true"/>
-    <component id="n14_ygap" name="btnAction" src="ygapep" fileName="components/Button15.xml" xy="109,53" group="n18_ygap" aspect="true"/>
-    <group id="n18_ygap" name="n18" xy="0,53" size="228,119" advanced="true"/>
+    <component id="n13_ygap" name="btnNormal" src="ygapep" fileName="components/Button15.xml" xy="1,53" group="n18_ygap" aspect="true"/>
+    <component id="n14_ygap" name="btnAction" src="ygapep" fileName="components/Button15.xml" xy="122,53" size="141,105" group="n18_ygap"/>
+    <group id="n18_ygap" name="n18" xy="1,53" size="262,105" advanced="true" layout="hz" colGap="16"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -8,12 +8,12 @@
     </loader>
     <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n6_8xpg" name="txtScore" xy="147,160" pivot="0.5,0" size="61,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
+    <text id="n6_8xpg" name="txtScore" xy="150,160" pivot="0.5,0" size="54,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
     <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="13,0" size="67,68"/>
     <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70" size="70,70"/>
     <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" size="208,42" group="n11_wono"/>
-    <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,42" group="n11_wono" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
+    <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,41" group="n11_wono" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
     <group id="n11_wono" name="n11" xy="13,198" size="208,43"/>
-    <component id="n12_ygap" name="comAxtionSelect" src="ygapet" fileName="components/ComActionSelect.xml" xy="4,0" visible="false"/>
+    <component id="n12_ygap" name="comAxtionSelect" src="ygapet" fileName="components/ComActionSelect.xml" xy="2,0" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/EnduringGiftBox/EnduringGiftBoxUI.xml

@@ -37,18 +37,17 @@
     <item time="0" type="Alpha" target="n2_qqhz" tween="true" startValue="0" endValue="1" duration="15"/>
     <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"/>
     <item time="0" type="Alpha" target="n3_qqhz" value="0"/>
     <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="Visible" target="n29_qqhz" value="false"/>
-    <item time="0" type="Visible" target="n35_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="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="8" type="Alpha" target="n35_qqhz" tween="true" startValue="0.4" endValue="1" duration="11"/>
     <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"/>
@@ -58,9 +57,9 @@
     <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="14" type="Visible" target="n35_qqhz" value="true"/>
     <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"/>

FGUIProject/assets/EnduringGiftBox/RushSaleGiftBoxUI.xml

@@ -0,0 +1,24 @@
+<?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">
+      <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"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/SpecialOfferGiftBoxUI.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1116">
+  <displayList>
+    <image id="n0_yjmk" name="n0" src="yjmk2v" fileName="images/bg02.png" xy="-9,142"/>
+    <image id="n1_yjmk" name="n1" src="yjmk2u" fileName="images/bg01.png" xy="29,15"/>
+    <image id="n3_yjmk" name="n3" src="yjmk2e" fileName="images/thlb_lihui.png" xy="51,-5"/>
+    <image id="n2_yjmk" name="n2" src="yjmk2g" fileName="images/wz_thlb.png" xy="76,39"/>
+    <image id="n5_yjmk" name="n5" src="yjmk2f" fileName="images/thlb_sj_db.png" xy="699,233"/>
+    <text id="n6_yjmk" name="txtBoxResidueTime" xy="701,229" size="251,42" fontSize="28" color="#fffcf9" align="center" autoSize="none" text="剩余6天23时13分"/>
+    <list id="n18_yjmk" name="list" xy="68,270" size="957,690" layout="flow_vt" scroll="both" lineGap="15" defaultItem="ui://bdi1qe15yjmk37">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n22_droi" name="btnUp" src="droi3c" fileName="components/BtnUp.xml" xy="-22,488"/>
+    <component id="n23_droi" name="btnNext" src="droi3d" fileName="components/BtnNext.xml" xy="933,488"/>
+    <component id="n24_droi" name="back" src="qqhz26" fileName="components/BnBack.xml" xy="494,1098"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnBuy.xml

@@ -3,11 +3,9 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n3_qqhz" name="bagGrey" src="qqhzm" fileName="images/cz_an_grey.png" xy="0,0"/>
-    <image id="n0_qqhz" name="bagYellow" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0" pkg="eg2y0ldp">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_qqhz" name="txtNewPrice" xy="146,2" size="104,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="12元"/>
-    <text id="n2_qqhz" name="txtOldPrice" xy="21,2" size="84,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="shrink" strike="true" text="86"/>
+    <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="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>
   <Button/>

FGUIProject/assets/EnduringGiftBox/components/BtnBuyPink.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="316,83" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <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"/>
+    <loader id="n5_yjmk" name="loaIcon" xy="122,22" size="33,31" fill="scale" shrinkOnly="true"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnBuyWeek.xml

@@ -2,9 +2,7 @@
 <component size="260,74" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_qqhz" name="n0" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0" pkg="eg2y0ldp">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <image id="n4_yjmk" name="n4" src="yjmk2y" fileName="images/button.png" xy="0,0"/>
     <text id="n1_qqhz" name="txtNewPrice" xy="135,0" size="106,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="300"/>
     <text id="n2_qqhz" name="txtOldPrice" xy="21,1" size="84,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" strike="true" text="2000"/>
     <image id="n3_qqhz" name="n3" src="qqhz10" fileName="images/lm_tb.png" xy="103,21"/>

FGUIProject/assets/EnduringGiftBox/components/BtnCancel.xml

@@ -5,7 +5,7 @@
     <image id="n0_qqhz" name="n0" src="qqhzn" fileName="images/cz_an_blue.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="取消"/>
+    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="取消"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/EnduringGiftBox/components/BtnNext.xml

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

FGUIProject/assets/EnduringGiftBox/components/BtnReceive.xml

@@ -3,9 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n2_qqhz" name="received" src="qqhzm" fileName="images/cz_an_grey.png" xy="0,0"/>
-    <image id="n0_qqhz" name="receive" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0" pkg="eg2y0ldp">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <image id="n3_yjmk" name="receive" src="yjmk2y" fileName="images/button.png" xy="0,0"/>
     <text id="n1_qqhz" name="txtRec" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="领取"/>
   </displayList>
   <Button/>

FGUIProject/assets/EnduringGiftBox/components/BtnSub.xml

@@ -2,10 +2,8 @@
 <component size="260,75" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_qqhz" name="n0" src="qqhzl" fileName="images/cz_an_pink.png" xy="0,0" pkg="eg2y0ldp">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="确定"/>
+    <image id="n2_yjmk" name="n2" src="yjmk3b" fileName="images/an_pink.png" xy="0,0"/>
+    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="确定"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/EnduringGiftBox/components/BtnUp.xml

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

FGUIProject/assets/EnduringGiftBox/components/ComCurSupplyItem.xml

@@ -8,10 +8,10 @@
     <component id="n4_qqhz" name="btnBuy" src="qqhzy" fileName="components/BtnBuy.xml" xy="656,90"/>
     <component id="n5_qqhz" name="btnCurReceive" src="qqhzv" fileName="components/BtnReceive.xml" xy="656,90"/>
     <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="SourceHanSerifCN-SemiBold" fontSize="28" color="#cc9974" align="center" autoSize="none" text="体力超值返利包"/>
-    <text id="n22_qqhz" name="txtWeekPrompt" xy="294,46" size="266,39" font="FZKTJW--GB1-0" fontSize="26" color="#bda5a8" align="center" autoSize="none" text="连续七天每日获得"/>
+    <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"/>
-    <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">
+    <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>
   </displayList>

FGUIProject/assets/EnduringGiftBox/components/ComDiscount.xml

@@ -2,7 +2,7 @@
 <component size="78,77">
   <displayList>
     <image id="n3_yjmk" name="n3" src="yjmk27" fileName="images/tb_zk_red.png" xy="-3,-2"/>
-    <text id="n1_qqhz" name="txtDiscountNum" xy="8,6" size="57,44" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffceb" align="center" autoSize="none" text="1.5"/>
-    <text id="n2_qqhz" name="n2" xy="18,36" size="38,34" font="SourceHanSerifCN-SemiBold" fontSize="24" color="#fffceb" align="center" autoSize="none" text="折"/>
+    <text id="n1_qqhz" name="txtDiscountNum" xy="8,6" size="57,44" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffceb" align="center" autoSize="none" text="1.5"/>
+    <text id="n2_qqhz" name="n2" xy="18,36" size="38,34" font="ui://eg2y0ldpa0cftkz" fontSize="24" color="#fffceb" align="center" autoSize="none" text="折"/>
   </displayList>
 </component>

FGUIProject/assets/EnduringGiftBox/components/ComDiscount2.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="120,109">
+  <displayList>
+    <image id="n4_yjmk" name="n4" src="yjmk2a" fileName="images/xsqg_zk_db.png" xy="0,0" size="120,109" aspect="true"/>
+    <text id="n1_qqhz" name="txtDiscountNum" xy="17,14" size="78,59" fontSize="44" color="#fffbf3" leading="0" letterSpacing="-2" autoSize="none" bold="true" text="1.3"/>
+    <text id="n2_qqhz" name="n2" xy="65,32" size="35,56" font="ui://eg2y0ldpa0cftks" fontSize="37" color="#fffceb" align="center" autoSize="none" shadowColor="#ffffff" shadowOffset="1,1" text="折"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/ComRsGifBoxIconItem.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="150,203">
+  <displayList>
+    <component id="n3_yjmk" name="comRewardIconItem" src="qqhz1g" fileName="components/ComRewardIconItem.xml" xy="3,2" size="132,132" aspect="true" scale="1.09,1.09"/>
+    <text id="n1_yjmk" name="txtItemName" xy="6,138" size="143,56" fontSize="39" color="#a47e49" align="center" autoSize="none" text="体力"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/ComSpecialOfferGiftBoxItem.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="940,213">
+  <displayList>
+    <image id="n0_yjmk" name="nczlb" src="qqhzg" fileName="images/cz_lb_db.png" xy="0,0" size="940,220" group="n8_yjmk"/>
+    <text id="n2_yjmk" name="txtBoxItemName" xy="55,7" size="459,44" group="n8_yjmk" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#cc9974" autoSize="none" text="体力补给礼包"/>
+    <component id="n3_yjmk" name="btnBuy" src="qqhzy" fileName="components/BtnBuy.xml" xy="660,85" size="261,73" group="n8_yjmk"/>
+    <image id="n4_yjmk" name="n4" src="qqhz8" fileName="images/lm_dt_tsdb_2.png" xy="679,8" group="n8_yjmk"/>
+    <text id="n5_yjmk" name="txtUrc" xy="714,13" size="216,42" group="n8_yjmk" rotation="-0.6" fontSize="28" color="#cc6960" align="center" leading="0" autoSize="none" text="今日限购1/1"/>
+    <text id="n6_yjmk" name="txtGetJf" xy="660,165" size="269,33" group="n8_yjmk" fontSize="28" color="#c69652" align="center" autoSize="none" text="可获得120会员积分"/>
+    <component id="n7_yjmk" name="comDiscount" src="qqhz1o" fileName="components/ComDiscount.xml" xy="629,59" size="78,66" group="n8_yjmk"/>
+    <list id="n9_yjmk" name="list" xy="57,58" size="439,133" group="n8_yjmk" scale="1.05,1.05" layout="flow_vt" overflow="scroll" scroll="horizontal" scrollBarFlags="32" colGap="16" defaultItem="ui://bdi1qe15qqhz1g" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n8_yjmk" name="n8" xy="0,0" size="940,220"/>
+    <image id="n1_yjmk" name="n1" src="yjmk2b" fileName="images/xsqg_zsx.png" xy="46,48"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/package.xml

@@ -46,6 +46,43 @@
     <image id="qqhz25" name="tili.png" path="/images/"/>
     <component id="qqhz26" name="BnBack.xml" path="/components/" exported="true"/>
     <image id="yjmk27" name="tb_zk_red.png" path="/images/"/>
+    <component id="yjmk28" name="SpecialOfferGiftBoxUI.xml" path="/" exported="true"/>
+    <component id="yjmk29" name="RushSaleGiftBoxUI.xml" path="/" exported="true"/>
+    <image id="yjmk2a" name="xsqg_zk_db.png" path="/images/"/>
+    <image id="yjmk2b" name="xsqg_zsx.png" path="/images/"/>
+    <image id="yjmk2d" name="thlb_db.png" path="/images/"/>
+    <image id="yjmk2e" name="thlb_lihui.png" path="/images/"/>
+    <image id="yjmk2f" name="thlb_sj_db.png" path="/images/"/>
+    <image id="yjmk2g" name="wz_thlb.png" path="/images/"/>
+    <image id="yjmk2h" name="wz_tlxslb.png" path="/images/"/>
+    <image id="yjmk2i" name="wz_xsqg.png" path="/images/"/>
+    <image id="yjmk2j" name="xsqg_db.png" path="/images/"/>
+    <image id="yjmk2k" name="xsqg_fy_an.png" path="/images/"/>
+    <image id="yjmk2l" name="xsqg_lihui.png" path="/images/"/>
+    <image id="yjmk2m" name="xsqg_nr_db.png" path="/images/"/>
+    <image id="yjmk2n" name="xsqg_sj_db.png" path="/images/"/>
+    <image id="yjmk2o" name="xsqg_fy_an_2.png" path="/images/"/>
+    <component id="yjmk2p" name="ComRsGifBoxIconItem.xml" path="/components/" exported="true"/>
+    <component id="yjmk2q" name="BtnBuyPink.xml" path="/components/" exported="true"/>
+    <component id="yjmk2r" name="ComDiscount2.xml" path="/components/" exported="true"/>
+    <image id="yjmk2s" name="back2.png" path="/images/"/>
+    <image id="yjmk2u" name="bg01.png" path="/images/"/>
+    <image id="yjmk2v" name="bg02.png" path="/images/"/>
+    <image id="yjmk2w" name="biao.png" path="/images/"/>
+    <image id="yjmk2x" name="but_Zhekou.png" path="/images/"/>
+    <image id="yjmk2y" name="button.png" path="/images/"/>
+    <image id="yjmk2z" name="daizi.png" path="/images/"/>
+    <image id="yjmk30" name="kuang.png" path="/images/"/>
+    <image id="yjmk33" name="samll_text.png" path="/images/"/>
+    <image id="yjmk34" name="text.png" path="/images/"/>
+    <image id="yjmk35" name="thing.png" path="/images/"/>
+    <image id="yjmk36" name="time_kuang.png" path="/images/"/>
+    <component id="yjmk37" name="ComSpecialOfferGiftBoxItem.xml" path="/components/" exported="true"/>
+    <image id="yjmk39" name="wpk_db_1_da.png" path="/images/"/>
+    <image id="yjmk3a" name="wpk_sz_db_1.png" path="/images/"/>
+    <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"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/EnduringGiftBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueAnswerRewardUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,647">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n0_pvb4" name="n0" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" pkg="eg2y0ldp"/>
+    <image id="n0_pvb4" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0"/>
     <component id="n1_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="895,25" size="111,96"/>
     <image id="n6_pvb4" name="n6" src="9jv66i" fileName="images/lm_biaotizi_13.png" xy="260,96"/>
     <image id="n2_pvb4" name="n2" src="wm603d" fileName="images/lm_yeqian_db.png" xy="143,153" size="293,56" group="n5_pvb4"/>
@@ -13,14 +13,14 @@
       <Button checked="true" title="活动奖励" controller="c1" page="1"/>
     </component>
     <group id="n5_pvb4" name="n5" xy="138,150" size="304,63"/>
-    <list id="n19_9jv6" name="listRule" xy="160,240" size="780,311" overflow="scroll" defaultItem="ui://tw70qm9d9jv67b">
+    <list id="n19_9jv6" name="listRule" xy="133,240" size="815,311" overflow="scroll" defaultItem="ui://tw70qm9d9jv67b">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n11_pvb4" name="list" xy="170,235" size="779,318" overflow="scroll" defaultItem="ui://tw70qm9dpvb459" align="center" autoClearItems="true">
+    <list id="n11_pvb4" name="list" xy="133,239" size="816,314" overflow="scroll" defaultItem="ui://tw70qm9dpvb459" align="center" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>

FGUIProject/assets/League/ListAnswerRuleItem.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="778,47">
+<component size="815,47">
   <displayList>
     <graph id="n20_9jv6" name="n20" xy="19,26" size="1,21" type="rect" lineSize="0" fillColor="#fff2e8e4">
       <relation target="n18_pvb4" sidePair="height-height"/>
     </graph>
     <image id="n19_9jv6" name="n19" src="9jv664" fileName="images/lm_zsd.png" xy="10,11"/>
-    <text id="n18_pvb4" name="txtRule" xy="45,1" size="733,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" ubb="true" autoSize="height" text="每天 开启雅集夜宴"/>
+    <text id="n18_pvb4" name="txtRule" xy="45,1" size="769,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" ubb="true" autoSize="none" text="每天 开启雅集夜宴"/>
   </displayList>
   <relation target="n18_pvb4" sidePair="height-height"/>
 </component>

FGUIProject/assets/League/components/ComLine.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="414,12" overflow="hidden">
+  <displayList>
+    <image id="n22_vols" name="n22" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="-140,0"/>
+  </displayList>
+</component>

FGUIProject/assets/League/components/ListAnswerRewardItem.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="792,50">
+<component size="815,50">
   <displayList>
-    <text id="n19_pvb4" name="txtDesc" xy="55,4" pivot="0.5,0" size="107,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#a9733e" align="center" text="答对1题"/>
-    <list id="n20_pvb4" name="listReward" xy="436,0" size="356,50" layout="row" overflow="scroll" colGap="30" defaultItem="ui://eg2y0ldpn3xha1">
+    <text id="n19_pvb4" name="txtDesc" xy="55,4" pivot="0.5,0" size="107,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#a9733e" align="center" text="答对1题"/>
+    <list id="n20_pvb4" name="listReward" xy="424,0" size="391,50" layout="row" colGap="35" defaultItem="ui://eg2y0ldpn3xha1">
+      <item/>
       <item/>
       <item/>
     </list>
-    <image id="n21_9jv6" name="n21" src="9jv664" fileName="images/lm_zsd.png" xy="0,15"/>
+    <image id="n21_9jv6" name="n21" src="9jv664" fileName="images/lm_zsd.png" xy="15,15"/>
+    <component id="n22_vols" name="n22" src="vols81" fileName="components/ComLine.xml" xy="161,19" size="262,12"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -201,6 +201,7 @@
     <image id="l5007y" name="yj_db_zz.png" path="/images/"/>
     <image id="l5007z" name="yj_zz.png" path="/images/"/>
     <component id="idkd80" name="ComSkillUp.xml" path="/"/>
+    <component id="vols81" name="ComLine.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/package.xml

@@ -71,6 +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/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -50,7 +50,7 @@
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kdhoaif" name="btnBag"/>
-      <item url="ui://mfvz4q8kwg7t8y" name="btnLeague"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnLeague"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
@@ -100,9 +100,22 @@
     <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n79_g1yr" name="btnFirstRecharge" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="423,223">
+    <component id="n79_g1yr" name="btnFirstRecharge" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="423,223" group="n88_ktf2">
       <Button title="首充"/>
     </component>
+    <component id="n80_ktf2" name="btnGiftBag1" src="ktf2o5" fileName="components/Button5.xml" xy="649,205" group="n83_ktf2">
+      <Button icon="ui://mfvz4q8kktf2o7"/>
+    </component>
+    <image id="n81_ktf2" name="n81" src="ktf2o8" fileName="images/cj_sj_db.png" xy="632,285" size="128,32" group="n83_ktf2"/>
+    <text id="n82_ktf2" name="txtGiftBagTime1" xy="646,280" pivot="0.5,0" size="100,39" group="n83_ktf2" fontSize="28" color="#fffbf9" align="center" text="03:23:45"/>
+    <group id="n83_ktf2" name="n83" xy="632,205" size="128,114" group="n88_ktf2" advanced="true"/>
+    <component id="n84_ktf2" name="btnGiftBag2" src="ktf2o5" fileName="components/Button5.xml" xy="782,207" group="n87_ktf2">
+      <Button icon="ui://mfvz4q8kktf2o7"/>
+    </component>
+    <image id="n85_ktf2" name="n85" src="ktf2o8" fileName="images/cj_sj_db.png" xy="765,287" size="128,32" group="n87_ktf2"/>
+    <text id="n86_ktf2" name="txtGiftBagTime2" xy="779,282" pivot="0.5,0" size="100,39" group="n87_ktf2" fontSize="28" color="#fffbf9" align="center" text="03:23:45"/>
+    <group id="n87_ktf2" name="n87" xy="765,207" size="128,114" group="n88_ktf2" advanced="true"/>
+    <group id="n88_ktf2" name="n88" xy="423,205" size="470,116"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n71_mzf8" tween="true" startValue="0" endValue="1" duration="10" ease="Linear"/>

FGUIProject/assets/Main/components/Button5.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,95" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n1_vek8" name="icon" xy="0,0" size="94,95" url="ui://mfvz4q8kktf2o6" autoSize="true"/>
+    <text id="n4_mbf1" name="title" xy="27,26" pivot="0.5,0.5" size="40,42" fontSize="30" align="center" vAlign="middle" text="">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n1_vek8" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/Main/package.xml

@@ -617,6 +617,10 @@
     <image id="9jv6o2" name="3Second.png" path="/imagesNew/"/>
     <component id="fqoro3" name="ComResultProMask.xml" path="/components/"/>
     <component id="mbf1o4" name="Button4.xml" path="/components/"/>
+    <component id="ktf2o5" name="Button5.xml" path="/components/"/>
+    <image id="ktf2o6" name="cj_yulan.png" path="/images/"/>
+    <image id="ktf2o7" name="cj_meirith.png" path="/images/"/>
+    <image id="ktf2o8" name="cj_sj_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/components/ListChargeItem.xml

@@ -3,7 +3,6 @@
   <displayList>
     <image id="n17_dmsi" name="n17" src="hhx9b" fileName="imagesNew/wp_baseboard.png" xy="0,0" size="304,492"/>
     <loader id="n15_d4iw" name="icon" xy="52,166" size="197,197" aspect="true" url="ui://p9mtgheohhx91j" fill="scaleMatchHeight"/>
-    <image id="n12_d4iw" name="imgDouble" src="hhx9a" fileName="imagesNew/wp_save_baseboard.png" xy="-1,338"/>
     <image id="n24_hhx9" name="n24" src="fqortau" fileName="imagesNew/sc_xian.png" xy="33,104" size="236,4"/>
     <text id="n16_d4iw" name="txtName" xy="13,56" pivot="0.5,0" size="275,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#5a3e16" align="center" letterSpacing="-2" text="稀有升星材料(自选)">
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -12,6 +11,8 @@
       <relation target="" sidePair="center-center"/>
     </component>
     <text id="n18_dmsi" name="txtDesc" xy="48,380" pivot="0.5,0" size="204,36" font="ui://eg2y0ldpa0cftks" fontSize="26" color="#ac4100" letterSpacing="-2" text="首充赠送+6000钻石"/>
-    <text id="n23_hhx9" name="n23" xy="9,337" size="122,41" fontSize="30" color="#ffffff" text="首充双倍"/>
+    <image id="n12_d4iw" name="n12" src="hhx9a" fileName="imagesNew/wp_save_baseboard.png" xy="-1,338" group="n25_vols"/>
+    <text id="n23_hhx9" name="n23" xy="9,337" size="122,41" group="n25_vols" fontSize="30" color="#ffffff" text="首充双倍"/>
+    <group id="n25_vols" name="grpDouble" xy="-1,337" size="156,47" advanced="true"/>
   </displayList>
 </component>

GameClient/Assets/Editor/Excel/ExcelChecker.cs

@@ -13,7 +13,6 @@ namespace GFGEditor
         public static void StartCheck()
         {
             CheckLuckyBoxCfg();
-            CheckBonusListCfg();
             CheckDropOutCfg();
             CheckStoryChapterCfg();
             CheckStoryLevelCfg();
@@ -34,23 +33,6 @@ namespace GFGEditor
             foreach (LuckyBoxCfg boxCfg in dataArray)
             {
                 CheckItemIdExist(boxCfg.costID, "抽奖LuckyBoxCfg.costID");
-                foreach (int valueInt in boxCfg.bonusShowArr)
-                {
-                    CheckBonusExist(valueInt, "抽奖LuckyBoxCfg.bonusShow");
-                }
-            }
-        }
-
-        private static void CheckBonusListCfg()
-        {
-            BonusListCfgArray cfgArray = BonusListCfgArray.Instance;
-            BonusListCfg[] dataArray = cfgArray.dataArray;
-            foreach (BonusListCfg cfg in dataArray)
-            {
-                foreach (int[] values in cfg.bonusListArr)
-                {
-                    CheckItemIdExist(values[0], "抽奖BonusListCfg.bonusList");
-                }
             }
         }
 
@@ -227,16 +209,6 @@ namespace GFGEditor
             }
         }
 
-        private static void CheckBonusExist(int id, string keyName)
-        {
-            BonusListCfgArray cfgArray = BonusListCfgArray.Instance;
-            BonusListCfg cfg = cfgArray.GetCfg(id);
-            if (cfg == null)
-            {
-                Debug.LogErrorFormat("{0}配置的奖励{1}不存在", new object[] { keyName, id });
-            }
-        }
-
         private static void CheckStoryDialogExist(string id, string keyName)
         {
             if (id.Length > 0)

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

@@ -2,21 +2,21 @@
 
 namespace GFGGame
 {
-
     public class EnduringGiftBoxController : SingletonBase<EnduringGiftBoxController>
     {
         private static EnduringGiftBoxView _enduringGiftBoxView;
 
-        public static void Show(int itemId, int count, Action onSuccess = null, string message = "")
+        public static void Show(int itemId, int count, Action onSuccess = null, string message = "", int type = 0)
         {
             if (_enduringGiftBoxView == null)
             {
                 _enduringGiftBoxView = new EnduringGiftBoxView();
             }
-            _enduringGiftBoxView.SetParams(itemId, count, onSuccess, message);
+
+            _enduringGiftBoxView.SetParams(itemId, count, onSuccess, message, type);
             _enduringGiftBoxView.Show();
         }
-        
+
         public static void hide()
         {
             if (_enduringGiftBoxView != null)
@@ -24,6 +24,7 @@ namespace GFGGame
                 _enduringGiftBoxView.Hide();
             }
         }
+
         public static void Dispose()
         {
             _enduringGiftBoxView = null;

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

@@ -177,6 +177,9 @@ namespace GFGGame
             ArenaDataManager.Instance.Clear();
             ChatDataManager.Instance.Clear();
             ActivityDataManager.Instance.Clear();
+            ActivityGlobalDataManager.Instance.Clear();
+            EnduringGiftBoxDataManager.Instance.Clear();
+            LimitedTimeGiftBoxDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

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

@@ -23,21 +23,29 @@ namespace GFGGame
 
         private Dictionary<int, List<int>> activityInfosByType = new Dictionary<int, List<int>>();
 
+        public void Clear()
+        {
+            activityInfos.Clear();
+            activityInfosByType.Clear();
+        }
+        
         //添加活动数据
         public void AddActivityInfo(ActivityInfo activityInfo)
         {
             if (activityInfo == null) return;
             if (activityInfos.ContainsKey(activityInfo.activityId)) return;
             activityInfos.Add(activityInfo.activityId, activityInfo);
-            if (!activityInfosByType.ContainsKey(activityInfo.activityId))
+
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.activityId);
+            if (!activityInfosByType.ContainsKey(activityOpenCfg.type))
             {
-                activityInfosByType.Add(activityInfo.activityId, new List<int>());
+                activityInfosByType.Add(activityOpenCfg.type, new List<int>());
             }
-            activityInfosByType[activityInfo.activityId].Add(activityInfo.activityId);
+            activityInfosByType[activityOpenCfg.type].Add(activityInfo.activityId);
             //ACTIVITY_ADD
             EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD, activityInfo.activityId);
             var remainTime = activityInfo.endTime - TimeHelper.ServerNow();
-            if(remainTime > 0)
+            if (remainTime > 0)
             {
                 Timers.inst.Add(activityInfo.endTime - TimeHelper.ServerNow(), 1, ClientRemoveActivityInfo,
                     activityInfo.activityId);

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

@@ -423,7 +423,7 @@ namespace GFGGame
         }
         public void ReqArenaInfo()
         {
-            if (FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name))
+            if (FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false))
             {
                 ArenaSproxy.ReqArenaInfos().Coroutine();
                 ArenaSproxy.ReqArenaHistory().Coroutine();

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

@@ -16,7 +16,7 @@ namespace GFGGame
         private static Dictionary<int, int> _dayAllRebateItemDic = new Dictionary<int, int>();
         public Dictionary<int, int> DayAllRebateItemDic => _dayAllRebateItemDic;
 
-        public void InitData()
+        public void Clear()
         {
             _dayRebateItemIds.Clear();
             _dayAllRebateItemDic.Clear();

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

@@ -0,0 +1,169 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using UI.DressUp;
+
+namespace GFGGame
+{
+    public class LimitedTimeGiftBoxDataManager : SingletonBase<LimitedTimeGiftBoxDataManager>
+    {
+        //列表数据3--等级条件的数据
+        private List<LimitedTimeGiftBoxItemData> _ltgGbItemData3 = new List<LimitedTimeGiftBoxItemData>();
+        public List<LimitedTimeGiftBoxItemData> LtgGbItemData3 => _ltgGbItemData3;
+
+        //圆形样式数据4--等级条件的数据 
+        private List<LimitedTimeGiftBoxItemYxData> _ltgGbItemData4 = new List<LimitedTimeGiftBoxItemYxData>();
+        public List<LimitedTimeGiftBoxItemYxData> LtgGbItemData4 => _ltgGbItemData4;
+
+        //圆形样式数据5--时间条件的数据
+        private List<LimitedTimeGiftBoxItemYxData> _ltgGbItemData5 = new List<LimitedTimeGiftBoxItemYxData>();
+        public List<LimitedTimeGiftBoxItemYxData> LtgGbItemData5 => _ltgGbItemData5;
+
+        public void Clear()
+        {
+            _ltgGbItemData3.Clear();
+            _ltgGbItemData4.Clear();
+            _ltgGbItemData5.Clear();
+        }
+        
+        public void UpLtgGbItemData3()
+        {
+            _ltgGbItemData3.Clear();
+            foreach (ActivityInfo activityInfo in ActivityGlobalDataManager.Instance.GetActivityInfoByType(
+                         ActivityType.XSLB1))
+            {
+                if (activityInfo.endTime >= TimeInfo.Instance.ServerNow())
+                {
+                    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.activityId);
+                    var paramsArr = activityOpenCfg.paramsArr;
+                    Array.Sort(paramsArr);
+                    foreach (var shopCfgId in paramsArr)
+                    {
+                        ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
+
+                        if (shopCfg == null)
+                        {
+                            Log.Error("shopCfg is null");
+                            continue;
+                        }
+
+                        LimitedTimeGiftBoxItemData ltgGbItemData =
+                            _ltgGbItemData3.FirstOrDefault(a => a.IndexType == shopCfg.menu2);
+                        if (ltgGbItemData != null)
+                        {
+                            if (ltgGbItemData.ShopCfgIds != null)
+                            {
+                                if (ltgGbItemData.ShopCfgIds.Count < 3)
+                                {
+                                    ltgGbItemData.ShopCfgIds.Add(shopCfgId);
+                                }
+                            }
+                            else
+                            {
+                                ltgGbItemData.ShopCfgIds = new List<int> { shopCfgId };
+                            }
+
+                            ltgGbItemData.EndTime = activityInfo.endTime;
+                            _ltgGbItemData3.Add(ltgGbItemData);
+                        }
+                        else
+                        {
+                            ltgGbItemData = new LimitedTimeGiftBoxItemData
+                            {
+                                IndexType = shopCfg.menu2,
+                                ShopCfgIds = new List<int> { shopCfgId },
+                                EndTime = activityInfo.endTime
+                            };
+
+                            _ltgGbItemData3.Add(ltgGbItemData);
+                        }
+                    }
+                }
+            }
+
+            //排序
+            foreach (var item in _ltgGbItemData3)
+            {
+                item.ShopCfgIds = item.ShopCfgIds.OrderBy(id => id).ToList();
+            }
+
+            _ltgGbItemData3 = _ltgGbItemData3.OrderBy(a => a.IndexType).ToList();
+        }
+
+        public void UpLtgGbItemData4()
+        {
+            _ltgGbItemData4.Clear();
+            foreach (ActivityInfo activityInfo in ActivityGlobalDataManager.Instance.GetActivityInfoByType(
+                         ActivityType.XSLB2))
+            {
+                if (activityInfo.endTime >= TimeInfo.Instance.ServerNow())
+                {
+                    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.activityId);
+                    //判断是否是类型4的数据
+                    if (activityOpenCfg.type == ActivityType.XSLB2)
+                    {
+                        foreach (var shopCfgId in activityOpenCfg.paramsArr)
+                        {
+                            FillData(_ltgGbItemData4, shopCfgId, activityInfo.endTime);
+                        }
+                    }
+                }
+            }
+
+            _ltgGbItemData4 = _ltgGbItemData4.OrderBy(a => a.ShopCfgId).ToList();
+        }
+
+        public void UpLtgGbItemData5()
+        {
+            _ltgGbItemData5.Clear();
+            foreach (ActivityInfo activityInfo in ActivityGlobalDataManager.Instance.GetActivityInfoByType(
+                         ActivityType.XSLB3))
+            {
+                if (activityInfo.endTime >= TimeInfo.Instance.ServerNow())
+                {
+                    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.activityId);
+                    //判断是否是类型4的数据
+                    if (activityOpenCfg.type == ActivityType.XSLB3)
+                    {
+                        FillData(_ltgGbItemData5, activityOpenCfg.paramsArr[0], activityInfo.endTime);
+                    }
+                }
+            }
+
+            _ltgGbItemData5 = _ltgGbItemData5.OrderBy(a => a.ShopCfgId).ToList();
+        }
+
+        private void FillData(List<LimitedTimeGiftBoxItemYxData> listData, int shopCfgId, long endTime)
+        {
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
+
+            if (shopCfg == null)
+            {
+                Log.Error("shopCfg is null");
+                return;
+            }
+
+            var ltgGbItemData = listData.FirstOrDefault(a => a.ShopCfgId == shopCfgId);
+            if (ltgGbItemData == null)
+            {
+                listData.Add(new LimitedTimeGiftBoxItemYxData
+                {
+                    EndTime = endTime,
+                    ShopCfgId = shopCfg.id,
+                    IndexType = shopCfg.menu2
+                });
+            }
+            else
+            {
+                var index = listData.IndexOf(ltgGbItemData);
+                ltgGbItemData.IndexType = shopCfg.menu2;
+                ltgGbItemData.EndTime = endTime;
+                listData[index] = ltgGbItemData;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3a50db5ef259460dbde7cd6c1dd74ec4
+timeCreated: 1685696577

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

@@ -1,7 +1,5 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace GFGGame
 {
@@ -71,24 +69,101 @@ namespace GFGGame
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
             if (!_dicShowList.ContainsKey(boxId))
             {
-                _dicShowList[boxId] = GetBonusDataList(luckyBoxCfg.bonusShowArr);
+                _dicShowList[boxId] = InitBonusDataList(luckyBoxCfg.dropId);
+
             }
         }
-        private List<LuckyBoxBonusData> GetBonusDataList(int[] idsList)
+
+        private List<LuckyBoxBonusData> InitBonusDataList(int dropId)
         {
+            Dictionary<int, LuckyBoxBonusData> dic = new Dictionary<int, LuckyBoxBonusData>();
+            AddToBonusDataDic(dropId, dic);
             List<LuckyBoxBonusData> list = new List<LuckyBoxBonusData>();
-            foreach (int id in idsList)
+            foreach(var t in dic)
             {
-                BonusListCfg bonusListCfg = BonusListCfgArray.Instance.GetCfg(id);
-                LuckyBoxBonusData luckyBoxBonusData = new LuckyBoxBonusData();
-                luckyBoxBonusData.id = id;
-                luckyBoxBonusData.name = bonusListCfg.name;
-                luckyBoxBonusData.itemList = ItemUtil.CreateItemDataList(bonusListCfg.bonusListArr);
-                list.Add(luckyBoxBonusData);
+                list.Add(t.Value);
             }
+            list.Sort(CompareBonusData);
             return list;
         }
 
+        private void AddToBonusDataDic(int dropId, Dictionary<int, LuckyBoxBonusData> dic)
+        {
+            List<DropOutCfg> cfgs = DropOutCfgArray.Instance.GetCfgsByid(dropId);
+            if (cfgs == null)
+            {
+                return;
+            }
+            foreach (DropOutCfg cfg in cfgs)
+            {
+                if (cfg.item > ConstItemID.MAX_ITEM_ID)//掉落id
+                {
+                    AddToBonusDataDic(cfg.item, dic);
+                }
+                else
+                {
+                    var group = cfg.group;
+                    if (cfg.group <= 0)
+                    {
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.item);
+                        if (itemCfg == null || itemCfg.suitId <= 0)
+                        {
+                            continue;
+                        }
+                        group = itemCfg.suitId;
+                    }
+                    LuckyBoxBonusData luckyBoxBonusData = GetBonusData(group, dic);
+                    if (luckyBoxBonusData == null)
+                    {
+                        continue;
+                    }
+                    luckyBoxBonusData.itemList.Add(ItemUtil.createItemData(cfg.item, 1));
+                }
+            }
+        }
+
+        private LuckyBoxBonusData GetBonusData(int group, Dictionary<int, LuckyBoxBonusData> dic)
+        {
+            dic.TryGetValue(group, out LuckyBoxBonusData luckyBoxBonusData);
+            if(luckyBoxBonusData != null)
+            {
+                return luckyBoxBonusData;
+            }
+            luckyBoxBonusData = new LuckyBoxBonusData();
+            luckyBoxBonusData.id = group;
+            BonusListCfg bonusListCfg = BonusListCfgArray.Instance.GetCfg(group);
+            if (bonusListCfg != null)
+            {
+                luckyBoxBonusData.name = bonusListCfg.name;
+                luckyBoxBonusData.order = bonusListCfg.sort;
+            }
+            else
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(group);
+                if (suitCfg == null)
+                {
+                    return null;
+                }
+                luckyBoxBonusData.name = suitCfg.name;
+                luckyBoxBonusData.order = 9999;
+            }
+            dic.Add(group, luckyBoxBonusData);
+            return luckyBoxBonusData;
+        }
+
+        public int CompareBonusData(LuckyBoxBonusData a, LuckyBoxBonusData b)
+        {
+            if(b.order < a.order)
+            {
+                return 1;
+            }
+            if(b.order > a.order)
+            {
+                return -1;
+            }
+            return a.id - b.id;
+        }
+
         public void GetOwnedCount(int boxId, out int count, out int totalCount)
         {
             count = 0;

GameClient/Assets/Game/HotUpdate/Data/VO/GiftBoxData.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class ActivityOpenData
+    {
+        //活动开启配置
+        public ActivityOpenCfg ActivityOpenCfgData;
+
+        //活动结束时间戳
+        public long ActivityEndTime;
+    }
+
+    /// <summary>
+    /// 限时礼包列表数据模型
+    /// </summary>
+    public class LimitedTimeGiftBoxItemData
+    {
+        //限时礼包_ShopCfg的menu2
+        public int IndexType;
+
+        //只存同一个menu2的3条数据,超出忽略
+        public List<int> ShopCfgIds;
+
+        public long EndTime;
+    }
+
+    /// <summary>
+    /// 圆形样式数据模型
+    /// </summary>
+    public class LimitedTimeGiftBoxItemYxData
+    {
+        public int ShopCfgId;
+
+        //限时礼包_ShopCfg的menu2
+        public int IndexType;
+
+        public long EndTime;
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/VO/GiftBoxData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 371bcaa6079b44e48cc3197e0a51d0c9
+timeCreated: 1685758053

GameClient/Assets/Game/HotUpdate/Data/VO/LuckyBoxBonusData.cs

@@ -6,6 +6,7 @@ namespace GFGGame
     {
         public int id;
         public string name;
-        public List<ItemData> itemList;
+        public int order;
+        public List<ItemData> itemList = new List<ItemData>();
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIcon
+    public partial class UI_ComIcon000
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -16,12 +16,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpng0itiz";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIcon";
-        private static UI_ComItemIcon _proxy;
+        public const string RES_NAME = "ComIcon000";
+        private static UI_ComIcon000 _proxy;
 
-        public static UI_ComItemIcon Create(GObject gObject = null)
+        public static UI_ComIcon000 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIcon();
+            var ui = new UI_ComIcon000();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIcon Proxy(GObject gObject = null)
+        public static UI_ComIcon000 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIcon();
+                _proxy = new UI_ComIcon000();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 27270b2db69f5bb4a9bcdc40af3f3ee2
+guid: 6ab0ba8a5e22ea948a6f5e2dbe615dd4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIconNew
+    public partial class UI_ComIcon001
     {
         public GComponent target;
         public GLoader m_bg;
@@ -18,12 +18,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldp9jv6tlt";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIconNew";
-        private static UI_ComItemIconNew _proxy;
+        public const string RES_NAME = "ComIcon001";
+        private static UI_ComIcon001 _proxy;
 
-        public static UI_ComItemIconNew Create(GObject gObject = null)
+        public static UI_ComIcon001 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIconNew();
+            var ui = new UI_ComIcon001();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -32,11 +32,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIconNew Proxy(GObject gObject = null)
+        public static UI_ComIcon001 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIconNew();
+                _proxy = new UI_ComIcon001();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b37e991627d2d46ca8f4e2ecc8288820
+guid: 4ad5e828cb8d0004488ba34ffb26c6e0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIconNew1
+    public partial class UI_ComIcon002
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -16,12 +16,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpqik1tlz";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIconNew1";
-        private static UI_ComItemIconNew1 _proxy;
+        public const string RES_NAME = "ComIcon002";
+        private static UI_ComIcon002 _proxy;
 
-        public static UI_ComItemIconNew1 Create(GObject gObject = null)
+        public static UI_ComIcon002 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIconNew1();
+            var ui = new UI_ComIcon002();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIconNew1 Proxy(GObject gObject = null)
+        public static UI_ComIcon002 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIconNew1();
+                _proxy = new UI_ComIcon002();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7a5d537a09290ee498209390a8913151
+guid: 8aa459e7d8832484abfa8f7737db7902
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComIcon003
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtHasCount;
+        public GLoader m_loaRarity;
+        public GImage m_imgHas;
+        public GImage m_imgNotHas;
+        public GImage m_imgShowTong;
+        public GGroup m_grpGot;
+        public const string URL = "ui://eg2y0ldpvolstnd";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComIcon003";
+        private static UI_ComIcon003 _proxy;
+
+        public static UI_ComIcon003 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComIcon003();
+            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_ComIcon003 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComIcon003();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_imgHas = (GImage)comp.GetChild("imgHas");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
+            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtHasCount = null;
+            m_loaRarity = null;
+            m_imgHas = null;
+            m_imgNotHas = null;
+            m_imgShowTong = null;
+            m_grpGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f7099fc706293db4d811169e4e3c899d
+guid: 8e9c5f8ad208b9448aa5016042fa8782
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItem
+    public partial class UI_ComItem000
     {
         public GComponent target;
-        public UI_ComItemIcon m_comItemIcon;
+        public UI_ComIcon000 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpj48o98";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem";
-        private static UI_ComItem _proxy;
+        public const string RES_NAME = "ComItem000";
+        private static UI_ComItem000 _proxy;
 
-        public static UI_ComItem Create(GObject gObject = null)
+        public static UI_ComItem000 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItem();
+            var ui = new UI_ComItem000();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItem Proxy(GObject gObject = null)
+        public static UI_ComItem000 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItem();
+                _proxy = new UI_ComItem000();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIcon)UI_ComItemIcon.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon000)UI_ComIcon000.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemBlue
+    public partial class UI_ComItem001_1
     {
         public GComponent target;
-        public UI_ComItemIconNew m_comItemIcon;
+        public UI_ComIcon001 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpmdmdtn5";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemBlue";
-        private static UI_ComItemBlue _proxy;
+        public const string RES_NAME = "ComItem001_1";
+        private static UI_ComItem001_1 _proxy;
 
-        public static UI_ComItemBlue Create(GObject gObject = null)
+        public static UI_ComItem001_1 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemBlue();
+            var ui = new UI_ComItem001_1();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemBlue Proxy(GObject gObject = null)
+        public static UI_ComItem001_1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemBlue();
+                _proxy = new UI_ComItem001_1();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemNew
+    public partial class UI_ComItem001_2
     {
         public GComponent target;
-        public UI_ComItemIconNew m_comItemIcon;
+        public UI_ComIcon001 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldp9jv6tls";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemNew";
-        private static UI_ComItemNew _proxy;
+        public const string RES_NAME = "ComItem001_2";
+        private static UI_ComItem001_2 _proxy;
 
-        public static UI_ComItemNew Create(GObject gObject = null)
+        public static UI_ComItem001_2 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemNew();
+            var ui = new UI_ComItem001_2();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemNew Proxy(GObject gObject = null)
+        public static UI_ComItem001_2 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemNew();
+                _proxy = new UI_ComItem001_2();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }