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

* 'master' of http://10.108.64.190:3000/gfg/Client: (33 commits)
  合成红点
  金卡获得展示
  搜索重置报错
  服装店属性字号
  战斗速度
  每日补给特效
  注释
  奖励展示报错
  卡牌红点
  购买弹窗点击区域
  字体单独问纹理
  雅集头像点击
  雅集技能特效
  月卡首次购买
  抽奖界面卡，轮换模型需要慢慢淡出
  动画脚本
  搜索
  搜索
  搜索
  充值
  ...

FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="882,208">
-  <controller name="c1" pages="0,,1,,2,,3," selected="1">
+  <controller name="c1" pages="0,,1,,2,,3," selected="2">
     <remark page="0" value="不可领取"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -23,7 +23,7 @@
     </component>
     <component id="n8_mbf1" name="btnGot" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="624,84" size="233,51">
       <gearDisplay controller="c1" pages="2"/>
-      <Button title="领取" icon="ui://eg2y0ldpnyhm6"/>
+      <Button title="已领取" icon="ui://eg2y0ldpnyhm6"/>
     </component>
     <component id="n6_mbf1" name="btnGo" src="9qpb4h" fileName="components/BtnStyle001.xml" pkg="eg2y0ldp" xy="648,80">
       <gearDisplay controller="c1" pages="3"/>

FGUIProject/assets/Arena/ArenaDanUpUI.xml

@@ -10,7 +10,7 @@
     <component id="n8_jcej" name="comLastDan" src="ofwu5q" fileName="components/ComDanIcon.xml" xy="204,160" pivot="0.5,0.5" size="250,302"/>
     <component id="n2_psph" name="comCurDan" src="ofwu5q" fileName="components/ComDanIcon.xml" xy="623,160" pivot="0.5,0.5" size="250,302" aspect="true" controller="c1,1"/>
     <image id="n5_jcej" name="n5" src="jcej3z" fileName="images/pmts_ffbtbt.png" xy="422,540" group="n11_jcej"/>
-    <list id="n1_psph" name="listFirstDanReward" xy="140,600" pivot="0.5,0" size="799,221" group="n11_jcej" layout="row" colGap="50" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+    <list id="n1_psph" name="listFirstDanReward" xy="140,600" pivot="0.5,0" size="799,221" group="n11_jcej" layout="row" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1250">
+<component size="1080,1250" opaque="false">
   <displayList>
     <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1250">
       <relation target="n33_l500" sidePair="height-height"/>

FGUIProject/assets/CommonGame/package.xml

@@ -338,7 +338,7 @@
     <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/"/>
-    <image id="volstne" name="lm_fl_db.png" path="/bgimg/" exported="true"/>
+    <image id="volstne" name="lm_fl_db.png" path="/bgimg/" exported="true" scale="9grid" scale9grid="269,804,538,315"/>
     <component id="volstnf" name="BtnStyle005.xml" path="/components/" exported="true"/>
     <component id="volstng" name="BtnStyle006.xml" path="/components/" exported="true"/>
     <component id="volstnh" name="ComItem003.xml" path="/components/" exported="true"/>

FGUIProject/assets/DailyWelfare/DailySupplyUI.xml

@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,837" opaque="false">
   <displayList>
-    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="207,69"/>
-    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="577,100" controller="c1,1"/>
-    <image id="n0_qik1" name="n0" src="qik1w" fileName="images/mrbj_shu.png" xy="0,194"/>
-    <image id="n13_qik1" name="n13" src="qik111" fileName="images/wz_mrbj.png" xy="36,168"/>
+    <component id="n0_qik1" name="comBg" src="ofwu23" fileName="components/ComSupplyBg.xml" xy="0,194" size="1080,644"/>
+    <component id="n10_qik1" name="comSupply" src="ofwu24" fileName="components/ComSupply.xml" xy="36,69"/>
     <image id="n14_qik1" name="n14" src="qik1v" fileName="images/wz_mrbj_ms.png" xy="955,161"/>
-    <image id="n15_qik1" name="n15" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="271,806" pivot="0.5,0.5" group="n18_qik1"/>
-    <text id="n16_qik1" name="txtGiftBag" xy="420,792" pivot="0.5,0" size="239,46" group="n18_qik1" fontSize="34" color="#d4d0c9" align="center" vars="true" text="点击空白处关闭"/>
-    <image id="n17_qik1" name="n17" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="678,806" pivot="0.5,0.5" group="n18_qik1" scale="-1,1"/>
-    <group id="n18_qik1" name="n18" xy="271,792" size="537,46" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <graph id="n19_ofwu" name="holder" xy="590,720" size="10,10"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n0_qik1" tween="true" startValue="0" endValue="1" duration="8" ease="Linear"/>
+    <item time="0" type="Alpha" target="n10_qik1" tween="true" startValue="0" endValue="1" duration="11" ease="Expo.In"/>
+    <item time="0" type="Alpha" target="n14_qik1" tween="true" startValue="0" endValue="1" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n0_qik1" tween="true" startValue="0,644" endValue="1080,644" duration="8" ease="Linear"/>
+    <item time="0" type="Visible" target="n19_ofwu" value="true"/>
+    <item time="0" type="XY" target="n10_qik1" tween="true" startValue="36,0" endValue="36,69" duration="8" ease="Linear"/>
+    <item time="8" type="Visible" target="n19_ofwu" value="true"/>
+  </transition>
 </component>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -2,9 +2,9 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n27_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <image id="n31_vols" name="n31" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" size="1235,2071" aspect="true">
+    <image id="n31_vols" name="n31" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" pivot="0.5,0" size="1235,2071">
       <relation target="" sidePair="width-width,height-height,top-top"/>
     </image>
     <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,67"/>
@@ -16,7 +16,7 @@
     </component>
     <group id="n3_fqor" name="grpTop" xy="0,80" size="1080,96"/>
     <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,210" size="987,1709">
-      <relation target="" sidePair="height-height"/>
+      <relation target="n31_vols" sidePair="top-top,bottomext-bottom"/>
     </component>
     <image id="n34_vols" name="n34" src="vols1t" fileName="images/hdrk_zz.png" xy="43,1667">
       <relation target="" sidePair="center-center,bottom-bottom"/>

FGUIProject/assets/DailyWelfare/ComList.xml → FGUIProject/assets/DailyWelfare/components/ComList.xml

@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="987,1514" overflow="scroll">
   <displayList>
-    <component id="n4_fqor" name="btnLimitChargeAddUp" src="qik1u" fileName="components/Button1.xml" xy="0,0" group="n30_idkd" controller="c1,1,c2,0">
-      <Button title="限时累充" icon="ui://t8nwuj7ivols1q"/>
-    </component>
-    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,351" group="n30_idkd" controller="c2,1">
+    <list id="n32_ofwu" name="listLimitCharge" xy="0,0" size="987,371" group="n30_idkd" overflow="hidden" defaultItem="ui://t8nwuj7iqik1u">
+      <item/>
+      <item/>
+    </list>
+    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,382" group="n30_idkd" controller="c2,1">
       <Button title="一周黄历"/>
       <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols20"/>
       <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols1z"/>
     </component>
-    <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,702" group="n30_idkd" controller="c2,2">
+    <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,733" group="n30_idkd" controller="c2,2">
       <Button title="每日签到" icon="ui://t8nwuj7ivols1y"/>
       <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols1y"/>
       <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols1m"/>
     </component>
-    <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1053" group="n30_idkd" controller="c2,3">
+    <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1084" group="n30_idkd" controller="c2,3">
       <Button title="每日补给" icon="ui://t8nwuj7ivols1x"/>
       <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols1x"/>
       <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols21"/>
     </component>
-    <group id="n30_idkd" name="n30" xy="0,0" size="987,1393" advanced="true" layout="vt" lineGap="11" excludeInvisibles="true"/>
+    <group id="n30_idkd" name="n30" xy="0,0" size="987,1424" advanced="true" layout="vt" lineGap="11" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ComSupply.xml

@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="378,643">
-  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+<component size="919,674">
   <displayList>
-    <image id="n29_qik1" name="n29" src="qik1z" fileName="images/mrbj_tb1.png" xy="-8,24" group="n27_qik1">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n30_qik1" name="n30" src="qik110" fileName="images/mrbj_wz2.png" xy="-8,24" group="n27_qik1">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <image id="n28_qik1" name="n28" src="qik1x" fileName="images/mrbj_sj_db.png" xy="75,17" group="n27_qik1"/>
-    <image id="n31_qik1" name="n31" src="qik1y" fileName="images/mrbj_sz_db.png" xy="204,287" group="n27_qik1"/>
-    <text id="n25_fqor" name="txtTime" xy="102,13" pivot="0.5,0" size="174,46" group="n27_qik1" fontSize="34" color="#fff9f8" align="center" text="11:00-17:00"/>
-    <component id="n23_fqor" name="btnGet" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="87,395" group="n27_qik1">
-      <Button title="补领"/>
-    </component>
-    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="144,469" pivot="0.4,0" group="n27_qik1" controller="c1,1,style,2"/>
-    <text id="n32_qik1" name="txtCount" xy="272,281" pivot="0.5,0" size="37,46" group="n27_qik1" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fffdf3" text="99"/>
-    <text id="n34_qik1" name="n34" xy="250,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="-20" fontSize="29" color="#fffdf3" text="\"/>
-    <text id="n33_qik1" name="n33" xy="251,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="20" fontSize="29" color="#fffdf3" text="/"/>
-    <group id="n35_qik1" name="n35" xy="250,284" size="18,40" group="n27_qik1"/>
-    <group id="n27_qik1" name="n27" xy="-8,13" size="378,612"/>
+    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupplyItem.xml" xy="171,0"/>
+    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupplyItem.xml" xy="541,31" controller="c1,1"/>
+    <image id="n13_qik1" name="n13" src="qik111" fileName="images/wz_mrbj.png" xy="0,99"/>
+    <graph id="n14_ofwu" name="holder" xy="15,148" size="10,10"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ComSupplyBg.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,644" pivot="0.5,0" overflow="hidden">
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1w" fileName="images/mrbj_shu.png" xy="0,0">
+      <relation target="" sidePair="width-width"/>
+    </image>
+    <image id="n15_qik1" name="n15" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="271,612" pivot="0.5,0.5" group="n18_ofwu"/>
+    <text id="n16_qik1" name="txtGiftBag" xy="420,598" pivot="0.5,0" size="239,46" group="n18_ofwu" fontSize="34" color="#d4d0c9" align="center" vars="true" text="点击空白处关闭"/>
+    <image id="n17_qik1" name="n17" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="678,612" pivot="0.5,0.5" group="n18_ofwu" scale="-1,1"/>
+    <group id="n18_ofwu" name="n18" xy="271,598" size="537,46" advanced="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/components/ComSupplyItem.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="378,643">
+  <controller name="c1" exported="true" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n29_qik1" name="n29" src="qik1z" fileName="images/mrbj_tb1.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n30_qik1" name="n30" src="qik110" fileName="images/mrbj_wz2.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n28_qik1" name="n28" src="qik1x" fileName="images/mrbj_sj_db.png" xy="75,17" group="n27_qik1"/>
+    <image id="n31_qik1" name="n31" src="qik1y" fileName="images/mrbj_sz_db.png" xy="204,287" group="n27_qik1"/>
+    <text id="n25_fqor" name="txtTime" xy="102,13" pivot="0.5,0" size="174,46" group="n27_qik1" fontSize="34" color="#fff9f8" align="center" text="11:00-17:00"/>
+    <component id="n23_fqor" name="btnGet" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="87,395" group="n27_qik1">
+      <Button title="补领"/>
+    </component>
+    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="144,469" pivot="0.4,0" group="n27_qik1" controller="c1,1,style,2"/>
+    <text id="n32_qik1" name="txtCount" xy="272,281" pivot="0.5,0" size="37,46" group="n27_qik1" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fffdf3" text="99"/>
+    <text id="n34_qik1" name="n34" xy="250,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="-20" fontSize="29" color="#fffdf3" text="\"/>
+    <text id="n33_qik1" name="n33" xy="251,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="20" fontSize="29" color="#fffdf3" text="/"/>
+    <group id="n35_qik1" name="n35" xy="250,284" size="18,40" group="n27_qik1"/>
+    <graph id="n36_ofwu" name="holder" xy="147,232" size="10,10" group="n27_qik1"/>
+    <group id="n27_qik1" name="n27" xy="-8,13" size="378,612"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1041,216">
-  <controller name="c1" pages="0,,1,,2," selected="0">
+  <controller name="c1" pages="0,,1,,2," selected="2">
     <remark page="0" value="不可领取"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -29,7 +29,7 @@
     </component>
     <component id="n8_mbf1" name="btnGot" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="775,74" size="233,51">
       <gearDisplay controller="c1" pages="2"/>
-      <Button title="领取" icon="ui://eg2y0ldpnyhm6"/>
+      <Button title="已领取" icon="ui://eg2y0ldpnyhm6"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -5,7 +5,7 @@
     <component id="fqor7" name="ProgressBar1.xml" path="/components/"/>
     <component id="fqor8" name="ComProBonus.xml" path="/components/" exported="true"/>
     <component id="fqor9" name="ListSignItem.xml" path="/components/"/>
-    <component id="fqora" name="ComSupply.xml" path="/components/"/>
+    <component id="fqora" name="ComSupplyItem.xml" path="/components/"/>
     <image id="qik1d" name="mrqd_sz_db.png" path="/images/"/>
     <image id="qik1e" name="mrqd_zz.png" path="/images/"/>
     <image id="qik1f" name="mrrw_jl_db.png" path="/images/"/>
@@ -75,7 +75,9 @@
     <image id="vols1z" name="hdbn_qtdl.png" path="/images/"/>
     <image id="vols20" name="hdbn_qtdl_kqdnf.png" path="/images/"/>
     <image id="vols21" name="hdbn_wz_mrbj.png" path="/images/"/>
-    <component id="vols22" name="ComList.xml" path="/"/>
+    <component id="vols22" name="ComList.xml" path="/components/"/>
+    <component id="ofwu23" name="ComSupplyBg.xml" path="/components/"/>
+    <component id="ofwu24" name="ComSupply.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/ArenaDressUpFightUI.xml

@@ -7,11 +7,11 @@
     <graph id="n0_qsvd" name="touchPad" xy="0,0" size="1080,1920" alpha="0" type="rect">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,60" group="n38_8lqj">
+    <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,60" group="n38_8lqj">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <image id="n50_f2bf" name="n50" src="f2bfey" fileName="images/dz_cdxzcdxz.png" xy="837,60" group="n51_f2bf"/>
-    <text id="n49_f2bf" name="txtDressLimit" xy="855,63" size="216,35" group="n51_f2bf" fontSize="25" color="#7a5e38" text="饰品穿戴限制：0/5"/>
+    <text id="n49_f2bf" name="txtDressLimit" xy="855,63" size="213,35" group="n51_f2bf" fontSize="25" color="#7a5e38" text="饰品穿戴限制：0/5"/>
     <group id="n51_f2bf" name="n51" xy="837,60" size="243,44" group="n38_8lqj"/>
     <graph id="n61_u2u3" name="grhCloseComFightScore" xy="0,0" size="1080,1920" group="n38_8lqj" alpha="0" type="rect">
       <relation target="" sidePair="width-width,height-height"/>
@@ -29,6 +29,9 @@
     <component id="n40_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,40" size="230,1880" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
+    <component id="n62_ofwu" name="partsListSearch" src="k6he1v" fileName="components/PartsList.xml" xy="1080,40" size="230,1880" group="n38_8lqj">
+      <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
+    </component>
     <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="46,1458" group="n44_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -43,6 +43,9 @@
     <component id="n40_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,40" size="230,1880" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
+    <component id="n52_ofwu" name="partsListSearch" src="k6he1v" fileName="components/PartsList.xml" xy="1080,40" size="230,1880" group="n38_8lqj">
+      <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
+    </component>
     <graph id="n20_8xpg" name="btnClose" xy="0,0" size="1080,1920" group="n38_8lqj" alpha="0" type="rect" fillColor="#ffff0000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>

FGUIProject/assets/DressUp/DressUpUI.xml

@@ -19,7 +19,7 @@
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wbrc0744"/>
     </component>
-    <component id="n3_q08x" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80" group="n30_8lqj">
+    <component id="n3_q08x" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n30_8lqj">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <component id="n4_q08x" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n30_8lqj" visible="false"/>
@@ -44,6 +44,9 @@
     <component id="n32_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n30_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
+    <component id="n36_ofwu" name="partsListSearch" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n30_8lqj">
+      <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
+    </component>
     <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="300,1730" group="n30_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>

FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -8,8 +8,9 @@
     </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"/>
-    <image id="n13_ofwu" name="n13" src="ofwuf8" fileName="images/huanzhuang_sz_db.png" xy="138,164"/>
-    <text id="n6_8xpg" name="txtScore" xy="146,156" pivot="0.5,0" size="66,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#e9e2d1" align="center" autoClearText="true" text="3500"/>
+    <image id="n13_ofwu" name="n13" src="ofwuf8" fileName="images/huanzhuang_sz_db.png" xy="138,164" group="n14_ofwu"/>
+    <text id="n6_8xpg" name="txtScore" xy="146,156" pivot="0.5,0" size="66,44" group="n14_ofwu" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#e9e2d1" align="center" autoClearText="true" text="3500"/>
+    <group id="n14_ofwu" name="grpScore" xy="138,156" size="80,44" advanced="true"/>
     <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"/>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="1">
+  <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="普通成员"/>
     <remark page="1" value="会长、副会长"/>
   </controller>
@@ -24,7 +24,7 @@
     <text id="n32_wm60" name="n32" xy="633,664" pivot="0.5,0" size="116,39" group="n34_wm60" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="累计贡献"/>
     <text id="n33_wm60" name="n33" xy="853,664" pivot="0.5,0" size="60,39" group="n34_wm60" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="状态"/>
     <group id="n34_wm60" name="n34" xy="0,662" size="1080,41"/>
-    <list id="n20_rv09" name="list" xy="68,705" size="941,796" overflow="scroll" defaultItem="ui://tw70qm9drv091n" autoClearItems="true">
+    <list id="n20_rv09" name="list" xy="68,705" size="941,809" overflow="scroll" defaultItem="ui://tw70qm9drv091n" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/League/components/ComLeader.xml

@@ -5,8 +5,8 @@
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <image id="n6_wm60" name="n6" src="wm6037" fileName="images/lm_db_touxiang.png" xy="0,0"/>
-    <loader id="n10_wm60" name="loaHeadBorder" xy="157,180" pivot="0.5,0.5" anchor="true" size="230,203" scale="1.2,1.2" url="ui://eg2y0ldpwm60tl7" autoSize="true"/>
-    <loader id="n4_rv09" name="loaTitle" xy="45,112" size="35,113" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
+    <loader id="n10_wm60" name="loaHeadBorder" xy="157,180" pivot="0.5,0.5" anchor="true" size="230,203" scale="1.2,1.2" touchable="false" url="ui://eg2y0ldpwm60tl7" autoSize="true"/>
+    <loader id="n4_rv09" name="loaTitle" xy="45,112" size="35,113" touchable="false" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
     <image id="n8_wm60" name="n8" src="wm6035" fileName="images/lm_mz_db.png" xy="30,257" group="n11_wm60"/>
     <text id="n9_wm60" name="txtLvl" xy="41,259" pivot="0.5,0" size="35,44" group="n11_wm60" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" text="20"/>
     <group id="n11_wm60" name="n11" xy="30,257" size="300,55"/>

FGUIProject/assets/League/components/ListMemberItem.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="950,131">
+<component size="950,129">
   <displayList>
     <component id="n15_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="16,-21" group="n27_wm60" scale="0.65,0.65"/>
     <loader id="n17_rv09" name="loaTitle" xy="28,10" size="33,77" group="n27_wm60" url="ui://tw70qm9dwm603w" autoSize="true"/>
     <text id="n16_rv09" name="txtName" xy="169,41" size="200,39" group="n27_wm60" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#923c1a" align="center" text="玩家名字七个字"/>
-    <text id="n11_rv09" name="txtWeekContribuation" xy="454,41" pivot="0.5,0" size="17,38" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
-    <text id="n12_rv09" name="txtAllContribuation" xy="610,41" pivot="0.5,0" size="17,38" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
-    <text id="n18_rv09" name="txtState" xy="755,41" pivot="0.5,0" size="112,38" group="n27_wm60" fontSize="27" color="#865118" align="center" text="12小时前"/>
+    <text id="n11_rv09" name="txtWeekContribuation" xy="454,41" pivot="0.5,0" size="17,37" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
+    <text id="n12_rv09" name="txtAllContribuation" xy="610,41" pivot="0.5,0" size="17,37" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
+    <text id="n18_rv09" name="txtState" xy="760,41" pivot="0.5,0" size="109,37" group="n27_wm60" fontSize="27" color="#865118" align="center" text="12小时前"/>
     <component id="n19_rv09" name="btnAppoint" src="rv091l" fileName="components/Button10.xml" xy="871,28" group="n27_wm60"/>
-    <image id="n20_wm60" name="n20" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="9,117" group="n27_wm60"/>
-    <group id="n27_wm60" name="n27" xy="9,-21" size="931,230"/>
+    <image id="n20_wm60" name="n20" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="35,117" size="880,12" group="n27_wm60"/>
+    <group id="n27_wm60" name="n27" xy="16,-21" size="921,230"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -5,12 +5,11 @@
     <image id="n16_gfx4" name="n16" src="miy37n" fileName="images/lm_ch_dldb.png" xy="0,0" pivot="0.5,0"/>
     <loader id="n23_miy3" name="loaIcon" xy="22,22" pivot="0.5,0.5" size="115,115" url="ui://tw70qm9de05086" autoSize="true"/>
     <image id="n20_miy3" name="n20" src="miy37i" fileName="images/lm_ch_szdk.png" xy="-7,127"/>
+    <image id="n17_gfx4" name="imgLock" src="miy37h" fileName="images/lm_ch_wdl_zz.png" xy="-6,-6"/>
     <loader id="n10_pvb4" name="loaScore" xy="28,3" size="44,44" group="n13_pvb4" url="ui://eg2y0ldp842s6h"/>
     <text id="n11_pvb4" name="txtScore" xy="73,0" size="60,50" group="n13_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="37" color="#7c561e" letterSpacing="-2" text="+10"/>
     <group id="n13_pvb4" name="n13" xy="28,0" size="105,50"/>
-    <image id="n17_gfx4" name="imgLock" src="miy37h" fileName="images/lm_ch_wdl_zz.png" xy="-6,-6"/>
     <image id="n21_miy3" name="imgSuo" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="59,75"/>
     <component id="n12_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="16,127" pivot="0.5,0" scale="0.75,0.75" controller="c1,1"/>
-    <graph id="n24_ofwu" name="holder" xy="76,76" size="10,10"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/combox/ComModel.xml

@@ -8,5 +8,14 @@
     <graph id="n39_dhoa" name="holder" xy="540,900" pivot="0.5,0.5" anchor="true" size="10,10">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
+    <loader id="n44_ofwu" name="loaMask" xy="0,-240" size="1080,2400" alpha="0" url="ui://drx9d1usduuftf2" align="center" vAlign="middle" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n44_ofwu" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n44_ofwu" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+  </transition>
 </component>

FGUIProject/assets/Main/FontNew/Font_Result.fnt

@@ -1,3 +1,4 @@
+info size=56 colored=false
 char id=48 img=qkjslx xoffset=0 yoffset=0 xadvance=0
 char id=49 img=qkjsly xoffset=0 yoffset=0 xadvance=0
 char id=50 img=qkjslz xoffset=0 yoffset=0 xadvance=0

FGUIProject/assets/Main/components/ComResult.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="983,374" pivot="0.5,0" anchor="true" overflow="hidden">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <graph id="n22_fqor" name="holderScore" xy="560,186" size="1,1" visible="false" type="rect"/>
     <image id="n17_qkjs" name="n17" src="qkjsk7" fileName="imagesNew/result.png" xy="477,159" visible="false"/>
-    <text id="n14_wono" name="txtScore" xy="594,158" size="104,60" visible="false" font="ui://mfvz4q8kqkjsnx" fontSize="40" color="#ecf6fc" letterSpacing="-10" singleLine="true" text="666">
+    <text id="n14_wono" name="txtScore" xy="594,158" size="134,60" visible="false" font="ui://mfvz4q8kqkjsnx" fontSize="40" color="#ecf6fc" letterSpacing="-10" singleLine="true" text="1111">
       <gearColor controller="c1" pages="0" values="#ecf6fc,#749dc8" default="#ecf6fc,#c49a49"/>
     </text>
     <graph id="n18_fqor" name="holderResult0" xy="184,186" size="2,2" visible="false" type="rect">

FGUIProject/assets/Main/package.xml

@@ -538,11 +538,11 @@
     <image id="qkjslu" name="font_prefect_6.png" path="/FontNew/"/>
     <image id="qkjslv" name="font_prefect_8.png" path="/FontNew/"/>
     <image id="qkjslw" name="font_prefect_9.png" path="/FontNew/"/>
-    <image id="qkjslx" name="font_result_0.png" path="/FontNew/"/>
-    <image id="qkjsly" name="font_result_1.png" path="/FontNew/"/>
-    <image id="qkjslz" name="font_result_2.png" path="/FontNew/"/>
-    <image id="qkjsm0" name="font_result_3.png" path="/FontNew/"/>
-    <image id="qkjsm1" name="font_result_4.png" path="/FontNew/"/>
+    <image id="qkjslx" name="font_result_0.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsly" name="font_result_1.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjslz" name="font_result_2.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsm0" name="font_result_3.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsm1" name="font_result_4.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsm2" name="font_prefect_7.png" path="/FontNew/"/>
     <image id="qkjsm3" name="font_great_9.png" path="/FontNew/"/>
     <image id="qkjsm4" name="font_great_8.png" path="/FontNew/"/>
@@ -564,10 +564,10 @@
     <image id="qkjsmk" name="font_great_4.png" path="/FontNew/"/>
     <image id="qkjsml" name="font_great_5.png" path="/FontNew/"/>
     <image id="qkjsmm" name="font_great_6.png" path="/FontNew/"/>
-    <image id="qkjsmn" name="font_result_5.png" path="/FontNew/"/>
+    <image id="qkjsmn" name="font_result_5.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsmo" name="font_zdqp_6.png" path="/FontNew/"/>
-    <image id="qkjsmp" name="font_result_6.png" path="/FontNew/"/>
-    <image id="qkjsmq" name="font_result_8.png" path="/FontNew/"/>
+    <image id="qkjsmp" name="font_result_6.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsmq" name="font_result_8.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsmr" name="font_zdka_0.png" path="/FontNew/"/>
     <image id="qkjsms" name="font_zdka_1.png" path="/FontNew/"/>
     <image id="qkjsmt" name="font_zdka_2.png" path="/FontNew/"/>
@@ -587,7 +587,7 @@
     <image id="qkjsn8" name="font_zdjs_8.png" path="/FontNew/"/>
     <image id="qkjsn9" name="font_zdjs_7.png" path="/FontNew/"/>
     <image id="qkjsna" name="font_zdjs_6.png" path="/FontNew/"/>
-    <image id="qkjsnb" name="font_result_9.png" path="/FontNew/"/>
+    <image id="qkjsnb" name="font_result_9.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsnc" name="font_score_0.png" path="/FontNew/"/>
     <image id="qkjsnd" name="font_score_1.png" path="/FontNew/"/>
     <image id="qkjsne" name="font_score_2.png" path="/FontNew/"/>
@@ -604,7 +604,7 @@
     <image id="qkjsnp" name="font_zdjs_3.png" path="/FontNew/"/>
     <image id="qkjsnq" name="font_zdjs_4.png" path="/FontNew/"/>
     <image id="qkjsnr" name="font_zdjs_5.png" path="/FontNew/"/>
-    <image id="qkjsns" name="font_result_7.png" path="/FontNew/"/>
+    <image id="qkjsns" name="font_result_7.png" path="/FontNew/" atlas="10"/>
     <font id="qkjsnu" name="Font_Fail.fnt" path="/FontNew/" exported="true"/>
     <font id="qkjsnv" name="Font_Great.fnt" path="/FontNew/" exported="true"/>
     <font id="qkjsnw" name="Font_Prefect.fnt" path="/FontNew/" exported="true"/>

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -24,6 +24,7 @@ namespace GFGGame
 
         public const string DRESS_FILTER = "DRESS_FILTER";
         public const string DRESS_SEARCH = "DRESS_SEARCH";
+        public const string DRESS_FILTER_RESET = "DRESS_FILTER_RESET";
         public const string CARD_CHOOSE = "CARD_CHOOSE";
         public const string CARD_SELECTED = "CARD_SELECTED";
         public const string SHOW_CARD_SKILL_END = "SHOW_CARD_SKILL_END";

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using ET;
 
 namespace GFGGame
 {
@@ -10,6 +11,7 @@ namespace GFGGame
             if (bonusInfos != null && bonusInfos.Length > 0)
             {
                 List<ItemData> bonusList = ItemUtil.CreateItemDataList(bonusInfos);
+                CheckUpdateAutoUseItem(bonusList);
                 ViewManager.Show<RewardView>(new object[] { bonusList, onSuccess });
             }
         }
@@ -17,8 +19,30 @@ namespace GFGGame
         {
             if (bonusList != null && bonusList.Count > 0)
             {
+                CheckUpdateAutoUseItem(bonusList);
                 ViewManager.Show<RewardView>(new object[] { bonusList, onSuccess });
             }
         }
+
+        private static void CheckUpdateAutoUseItem(List<ItemData> bonusList)
+        {
+            List<ItemData> itemDatasFromAutoUsedItem = new List<ItemData>();
+            int count = bonusList.Count;
+            for (var i = count - 1; i >= 0; i--)
+            {
+                var t = bonusList[i];
+                var itemCfg = ItemCfgArray.Instance.GetCfg(t.id);
+                if (itemCfg != null && itemCfg.itemType == ConstItemType.USEABLE &&
+                    (itemCfg.subType == ConstItemSubType.USEABLE_AUTO))
+                {
+                    if(itemCfg.itemsArr != null && itemCfg.itemsArr.Length > 0)
+                    {
+                        itemDatasFromAutoUsedItem.AddRange(ItemUtil.CreateItemDataList(itemCfg.itemsArr, t.num));
+                        bonusList.RemoveAt(i);
+                    }
+                }
+            }
+            bonusList.AddRange(itemDatasFromAutoUsedItem);
+        }
     }
 }

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

@@ -25,6 +25,7 @@ namespace GFGGame
         private static Dictionary<int, List<int>> _itemDatasBySubTypeDic = new Dictionary<int, List<int>>();
         public static Dictionary<int, List<int>> ItemDatasBySubTypeDic { get { return _itemDatasBySubTypeDic; } }
         private static Dictionary<int, List<int>> _newItemdata = new Dictionary<int, List<int>>();
+        private static Dictionary<int, List<int>> _itemDatasByRarityDic = new Dictionary<int, List<int>>();
         private static List<int> _newSuitData = new List<int>();
 
         public static void InitData()
@@ -32,6 +33,7 @@ namespace GFGGame
             _itemDatas.Clear();
             _newItemdata.Clear();
             _itemDatasBySubTypeDic.Clear();
+            _itemDatasByRarityDic.Clear();
         }
         public static void Clear()
         {
@@ -59,6 +61,12 @@ namespace GFGGame
                 }
                 _itemDatasBySubTypeDic[subType].Add(value);
 
+                if (!_itemDatasByRarityDic.ContainsKey(itemInfoProto.Rarity))
+                {
+                    _itemDatasByRarityDic.Add(itemInfoProto.Rarity, new List<int>());
+                }
+                _itemDatasByRarityDic[itemInfoProto.Rarity].Add(value);
+
                 if (GameGlobal.DataInited)
                 {
                     AddNewDressItem(value);
@@ -88,6 +96,11 @@ namespace GFGGame
             {
                 _itemDatasBySubTypeDic[subType].Remove(value);
             }
+            int rarity = ItemCfgArray.Instance.GetCfg(value).rarity;
+            if (_itemDatasByRarityDic.ContainsKey(rarity) && _itemDatasByRarityDic[rarity].IndexOf(value) >= 0)
+            {
+                _itemDatasByRarityDic[rarity].Remove(value);
+            }
 
         }
 
@@ -316,7 +329,47 @@ namespace GFGGame
         // {
         //     return ItemDataManager.GetItemAdditionScore(itemId, InstanceZonesDataManager.currentScoreType);
         // }
+        public static List<int> DressSearch(bool includeScene = true)
+        {
+            List<int> searchList = new List<int>();
+            for (int i = 0; i < _itemDatas.Count; i++)
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemDatas[i]);
+                if (!includeScene && DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(_itemDatas[i])) continue;
+                if (itemCfg.name.IndexOf(dressSearchTxt) >= 0 && searchList.IndexOf(itemCfg.id) < 0)
+                {
+                    searchList.Add(itemCfg.id);
+                }
+            }
+            return searchList;
+        }
+        public static List<int> DressFilter(bool includeScene = true)
+        {
+            List<int> filterList = new List<int>();
+            for (int i = 0; i < _itemDatas.Count; i++)
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemDatas[i]);
+                if (!includeScene && DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(_itemDatas[i])) continue;
+                bool isTag = selectTagList.Count == 0;
+                if (selectTagList.Count > 0)
+                {
+                    for (int j = 0; j < itemCfg.tagsArr.Length; j++)
+                    {
+                        if (selectTagList.IndexOf(itemCfg.tagsArr[j][0]) >= 0)
+                        {
+                            isTag = true;
+                            break;
+                        }
+                    }
+                }
+                if (!isTag) continue;
+                if (selectRarityList.Count > 0 && selectRarityList.IndexOf(itemCfg.rarity) < 0) continue;
+                if (selectScoreList.Count > 0 && selectScoreList.IndexOf(itemCfg.mainScore) < 0) continue;
 
+                filterList.Add(itemCfg.id);
+            }
+            return filterList;
+        }
         public static List<int> DressSearch(List<int> list)
         {
             List<int> searchList = new List<int>();

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

@@ -261,7 +261,78 @@ namespace GFGGame
         {
             return RoleInfoManager.Instance.newHeadBorderDatas.Count > 0;
         }
+        /// <summary>
+        /// 卡牌
+        /// </summary>
+        /// <returns></returns>
+        public bool GetCardRed()
+        {
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(CardDetailView), false)) return false;
+            List<CardData> cardDatas = CardDataManager.GetCardListByRarity(0);
+            for (int i = 0; i < cardDatas.Count; i++)
+            {
+                if (GetCardRed(cardDatas[i].id)) return true;
+            }
+            return false;
+        }
+        /// <summary>
+        /// 卡牌
+        /// </summary>
+        /// <returns></returns>
+        public bool GetCardRed(int cardId)
+        {
+            return GetCardStarReward(cardId) || GetCardUpStarRed(cardId) || GetCardSkillsRed(cardId) || GetCardUpLvRed(cardId);
+        }
+
+        /// <summary>
+        /// 卡牌-升级红点
+        /// </summary>
+        /// <param name="cardId"></param>
+        /// <returns></returns>
+        public bool GetCardUpLvRed(int cardId)
+        {
+            CardData cardData = CardDataManager.GetCardDataById(cardId);
+            int maxLv = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).cardLeverLimit;
+            if (cardData.lv >= maxLv) return false;
+            if (cardData.lv == CardRarityCfgArray.Instance.GetCfg(cardData.itemCfg.rarity).maxCardLvl) return false;
+
+            int curExp = cardData.exp;
+            int needExp = CardLvlCfgArray.Instance.GetCfgByrarityAndcardLvl(cardData.itemCfg.rarity, cardData.lv).needExp;
+
+            int cardUpLvGoldsNeed = 0;
+            int[] materials = GlobalCfgArray.globalCfg.upgradeCardItemsArr;
+            for (int i = 0; i < materials.Length; i++)
+            {
+                int[] cardUpLvGolds = ItemCfgArray.Instance.GetCfg(materials[i]).cardUpLvGoldsArr[i];
 
+                for (int j = 0; j < ItemDataManager.GetItemNum(materials[i]); j++)
+                {
+                    cardUpLvGoldsNeed += cardUpLvGolds[1];
+                    curExp += ItemCfgArray.Instance.GetCfg(materials[i]).cardUpLvExp;
+                    if (curExp >= needExp && ItemDataManager.GetItemNum(cardUpLvGolds[0]) >= cardUpLvGoldsNeed) return true;
+                }
+            }
+            return false;
+
+        }
+        /// <summary>
+        /// 卡牌-升星红点
+        /// </summary>
+        /// <param name="cardId"></param>
+        /// <returns></returns>
+        public bool GetCardUpStarRed(int cardId)
+        {
+            CardData cardData = CardDataManager.GetCardDataById(cardId);
+            List<CardStarCfg> starCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(cardId);
+            if (cardData.star >= starCfgs.Count) return false;
+            CardStarCfg starCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(cardId, cardData.star);
+            if (ItemDataManager.GetItemNum(starCfg.costID) < starCfg.costNum) return false;
+            for (int i = 0; i < starCfg.materiarsArr.Length; i++)
+            {
+                if (ItemDataManager.GetItemNum(starCfg.materiarsArr[i][0]) < starCfg.materiarsArr[i][1]) return false;
+            }
+            return true;
+        }
         /// <summary>
         /// 卡牌-卡牌技能升级
         /// </summary>
@@ -406,22 +477,39 @@ namespace GFGGame
             if (suitCfg == null) return false;
             for (int i = 0; i < suitCfg.partsArr.Length; i++)
             {
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[i]);
-                if (ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum) continue;
+                if (CheckCanSynthetic(suitCfg.partsArr[i])) return true;
+            }
+            return false;
+        }
+        /// <summary>
+        /// 合成-服装部件红点
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <param name="showTips"></param>
+        /// <returns></returns>
+        public bool CheckCanSynthetic(int itemId)
+        {
+            //合成材料判断
+            if (ItemDataManager.GetItemNum(itemId) > 0) return false;
 
-                bool isEnough = true;
-                for (int j = 0; j < itemCfg.syntheticMateriarsArr.Length; j++)
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if (itemCfg == null || ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum)
+            {
+                return false;
+            }
+            List<ItemData> materiarsOfSelectedItem = ItemUtil.CreateItemDataList(itemCfg.syntheticMateriarsArr);
+            for (int i = 0; i < materiarsOfSelectedItem.Count; i++)
+            {
+                ItemData itemData = materiarsOfSelectedItem[i];
+                long numSynthetic = ItemDataManager.GetItemNum(itemData.id);
+                if (numSynthetic < itemData.num)
                 {
-                    if (ItemDataManager.GetItemNum(itemCfg.syntheticMateriarsArr[j][0]) < itemCfg.syntheticMateriarsArr[j][1])
-                    {
-                        isEnough = false;
-                        break;
-                    }
+                    return false;
                 }
-                if (isEnough) return true;
             }
-            return false;
+            return true;
         }
+
         /// <summary>
         /// 商城
         /// </summary>
@@ -644,10 +732,18 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetLimiteChargeRewardRed()
         {
-            if (ActivityDataManager.Instance.actLimitChargeId == 0) return false;
-            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
+            List<ActivityInfo> _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
+            for (int i = 0; i < _limitChargeInfo.Count; i++)
+            {
+                if (GetLimiteChargeRewardRed(_limitChargeInfo[i].ActivityId)) return true;
+            }
+            return false;
+        }
+        public bool GetLimiteChargeRewardRed(int activityId)
+        {
+            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(activityId);
             if (_activityInfo == null) return false;
-            List<ActivityRechargeCfg> _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
+            List<ActivityRechargeCfg> _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(activityId);
             for (int i = 0; i < _rechargeCfgs.Count; i++)
             {
                 if (_activityInfo.CountValue >= _rechargeCfgs[i].value && _activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) < 0)

GameClient/Assets/Game/HotUpdate/Effect/AutoRotation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 99a33f4cc350ca44485132f794e31efc
+guid: 76ee16b085310964ba445507e2ee1e47
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComList.cs

@@ -7,7 +7,7 @@ namespace UI.DailyWelfare
     public partial class UI_ComList
     {
         public GComponent target;
-        public UI_Button1 m_btnLimitChargeAddUp;
+        public GList m_listLimitCharge;
         public UI_Button1 m_btnSevenDayLogin;
         public UI_Button1 m_btnSign;
         public UI_Button1 m_btnSupply;
@@ -58,15 +58,14 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
-            m_btnLimitChargeAddUp = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLimitChargeAddUp"));
+            m_listLimitCharge = (GList)comp.GetChild("listLimitCharge");
             m_btnSevenDayLogin = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSevenDayLogin"));
             m_btnSign = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSign"));
             m_btnSupply = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSupply"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_btnLimitChargeAddUp.Dispose();
-            m_btnLimitChargeAddUp = null;
+            m_listLimitCharge = null;
             m_btnSevenDayLogin.Dispose();
             m_btnSevenDayLogin = null;
             m_btnSign.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupply.cs

@@ -7,12 +7,10 @@ namespace UI.DailyWelfare
     public partial class UI_ComSupply
     {
         public GComponent target;
-        public Controller m_c1;
-        public GTextField m_txtTime;
-        public GButton m_btnGet;
-        public GComponent m_comCost;
-        public GTextField m_txtCount;
-        public const string URL = "ui://t8nwuj7ifqora";
+        public UI_ComSupplyItem m_comSupply0;
+        public UI_ComSupplyItem m_comSupply1;
+        public GGraph m_holder;
+        public const string URL = "ui://t8nwuj7iofwu24";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ComSupply";
         private static UI_ComSupply _proxy;
@@ -59,19 +57,17 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_btnGet = (GButton)comp.GetChild("btnGet");
-            m_comCost = (GComponent)comp.GetChild("comCost");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_comSupply0 = (UI_ComSupplyItem)UI_ComSupplyItem.Create(comp.GetChild("comSupply0"));
+            m_comSupply1 = (UI_ComSupplyItem)UI_ComSupplyItem.Create(comp.GetChild("comSupply1"));
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_txtTime = null;
-            m_btnGet = null;
-            m_comCost = null;
-            m_txtCount = null;
+            m_comSupply0.Dispose();
+            m_comSupply0 = null;
+            m_comSupply1.Dispose();
+            m_comSupply1 = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupplyBg.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ComSupplyBg
+    {
+        public GComponent target;
+        public GTextField m_txtGiftBag;
+        public const string URL = "ui://t8nwuj7iofwu23";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ComSupplyBg";
+        private static UI_ComSupplyBg _proxy;
+
+        public static UI_ComSupplyBg Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSupplyBg();
+            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_ComSupplyBg Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSupplyBg();
+            }
+            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_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtGiftBag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupplyBg.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupplyItem.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ComSupplyItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtTime;
+        public GButton m_btnGet;
+        public GComponent m_comCost;
+        public GTextField m_txtCount;
+        public GGraph m_holder;
+        public const string URL = "ui://t8nwuj7ifqora";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ComSupplyItem";
+        private static UI_ComSupplyItem _proxy;
+
+        public static UI_ComSupplyItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSupplyItem();
+            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_ComSupplyItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSupplyItem();
+            }
+            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_c1 = comp.GetController("c1");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_comCost = (GComponent)comp.GetChild("comCost");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtTime = null;
+            m_btnGet = null;
+            m_comCost = null;
+            m_txtCount = null;
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupplyItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySupplyUI.cs

@@ -7,9 +7,10 @@ namespace UI.DailyWelfare
     public partial class UI_DailySupplyUI
     {
         public GComponent target;
-        public UI_ComSupply m_comSupply0;
-        public UI_ComSupply m_comSupply1;
-        public GTextField m_txtGiftBag;
+        public UI_ComSupplyBg m_comBg;
+        public UI_ComSupply m_comSupply;
+        public GGraph m_holder;
+        public Transition m_t0;
         public const string URL = "ui://t8nwuj7iqik1t";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "DailySupplyUI";
@@ -57,17 +58,19 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
-            m_comSupply0 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply0"));
-            m_comSupply1 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply1"));
-            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+            m_comBg = (UI_ComSupplyBg)UI_ComSupplyBg.Create(comp.GetChild("comBg"));
+            m_comSupply = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply"));
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comSupply0.Dispose();
-            m_comSupply0 = null;
-            m_comSupply1.Dispose();
-            m_comSupply1 = null;
-            m_txtGiftBag = null;
+            m_comBg.Dispose();
+            m_comBg = null;
+            m_comSupply.Dispose();
+            m_comSupply = null;
+            m_holder = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ArenaDressUpFightUI.cs

@@ -17,6 +17,7 @@ namespace UI.DressUp
         public UI_comListType m_comListType2;
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList2;
+        public UI_PartsList m_partsListSearch;
         public GButton m_btnDelete;
         public GButton m_btnSearch;
         public GButton m_btnNext;
@@ -78,6 +79,7 @@ namespace UI.DressUp
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
+            m_partsListSearch = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsListSearch"));
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_btnNext = (GButton)comp.GetChild("btnNext");
@@ -99,6 +101,8 @@ namespace UI.DressUp
             m_partsList = null;
             m_partsList2.Dispose();
             m_partsList2 = null;
+            m_partsListSearch.Dispose();
+            m_partsListSearch = null;
             m_btnDelete = null;
             m_btnSearch = null;
             m_btnNext = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs

@@ -21,6 +21,7 @@ namespace UI.DressUp
         public UI_comListType m_comListType2;
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList2;
+        public UI_PartsList m_partsListSearch;
         public GGraph m_btnClose;
         public GTextField m_txtHint;
         public GGroup m_grpTips;
@@ -97,6 +98,7 @@ namespace UI.DressUp
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
+            m_partsListSearch = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsListSearch"));
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_txtHint = (GTextField)comp.GetChild("txtHint");
             m_grpTips = (GGroup)comp.GetChild("grpTips");
@@ -134,6 +136,8 @@ namespace UI.DressUp
             m_partsList = null;
             m_partsList2.Dispose();
             m_partsList2 = null;
+            m_partsListSearch.Dispose();
+            m_partsListSearch = null;
             m_btnClose = null;
             m_txtHint = null;
             m_grpTips = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpUI.cs

@@ -19,6 +19,7 @@ namespace UI.DressUp
         public UI_comListType m_comListType2;
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList2;
+        public UI_PartsList m_partsListSearch;
         public GButton m_btnSave;
         public GButton m_btnNext;
         public GButton m_btnAction;
@@ -88,6 +89,7 @@ namespace UI.DressUp
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
+            m_partsListSearch = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsListSearch"));
             m_btnSave = (GButton)comp.GetChild("btnSave");
             m_btnNext = (GButton)comp.GetChild("btnNext");
             m_btnAction = (GButton)comp.GetChild("btnAction");
@@ -117,6 +119,8 @@ namespace UI.DressUp
             m_partsList = null;
             m_partsList2.Dispose();
             m_partsList2 = null;
+            m_partsListSearch.Dispose();
+            m_partsListSearch = null;
             m_btnSave = null;
             m_btnNext = null;
             m_btnAction = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PartsListItem.cs

@@ -13,6 +13,7 @@ namespace UI.DressUp
         public GLoader m_rarity;
         public GLoader m_ScoreType;
         public GTextField m_txtScore;
+        public GGroup m_grpScore;
         public GImage m_imgNeed;
         public GImage m_imgNew;
         public GTextField m_txtTitle;
@@ -70,6 +71,7 @@ namespace UI.DressUp
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_ScoreType = (GLoader)comp.GetChild("ScoreType");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
             m_imgNeed = (GImage)comp.GetChild("imgNeed");
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
@@ -83,6 +85,7 @@ namespace UI.DressUp
             m_rarity = null;
             m_ScoreType = null;
             m_txtScore = null;
+            m_grpScore = null;
             m_imgNeed = null;
             m_imgNew = null;
             m_txtTitle = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillItem.cs

@@ -9,12 +9,11 @@ namespace UI.League
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaIcon;
+        public GImage m_imgLock;
         public GLoader m_loaScore;
         public GTextField m_txtScore;
-        public GImage m_imgLock;
         public GImage m_imgSuo;
         public GComponent m_comCost;
-        public GGraph m_holder;
         public const string URL = "ui://tw70qm9dpvb45d";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListSkillItem";
@@ -64,23 +63,21 @@ namespace UI.League
         {
             m_c1 = comp.GetController("c1");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
             m_imgSuo = (GImage)comp.GetChild("imgSuo");
             m_comCost = (GComponent)comp.GetChild("comCost");
-            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaIcon = null;
+            m_imgLock = null;
             m_loaScore = null;
             m_txtScore = null;
-            m_imgLock = null;
             m_imgSuo = null;
             m_comCost = null;
-            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,6 +10,9 @@ namespace UI.LuckyBox
         public GLoader m_loaBg;
         public GLoader m_loaRes;
         public GGraph m_holder;
+        public GLoader m_loaMask;
+        public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://drx9d1usmbf1tah";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComModel";
@@ -60,12 +63,18 @@ namespace UI.LuckyBox
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaRes = (GLoader)comp.GetChild("loaRes");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_loaMask = (GLoader)comp.GetChild("loaMask");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_loaRes = null;
             m_holder = null;
+            m_loaMask = null;
+            m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

@@ -63,7 +63,7 @@
             }
         }
 
-        public static void Pay(int buyID, int count)
+        public static void Pay(int buyID, int count, string orderID, long Price)
         {
             switch (LauncherConfig.ChannelId)
             {

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -210,6 +210,8 @@ namespace GFGGame
                     ArenaDataManager.Instance.LastTargetInfo.headRes = targetData.RoleInfo.headRes;
                     ArenaDataManager.Instance.BonusList = ItemUtil.CreateItemDataList(response.rewards);
                     ArenaDataManager.Instance.LastTargets = new List<ArenaTargetData>(ArenaDataManager.Instance.Targets);
+                    ArenaDataManager.Instance.RewardId = response.RewardId;
+
                     //更新新数据
                     ArenaDataManager.Instance.Targets.Clear();
                     for (int i = 0; i < response.targets.Count; i++)

GameClient/Assets/Game/HotUpdate/ServerProxy/CardSProxy.cs

@@ -51,6 +51,7 @@ namespace GFGGame
                     {
                         cardData.scores[response.KsAttribute[i]] = response.VsAttribute[i];
                     }
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }
@@ -74,6 +75,7 @@ namespace GFGGame
                     {
                         cardData.starRewardsState[response.KsStarBonus[i]] = response.VsStarBonus[i];
                     }
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }
@@ -110,6 +112,7 @@ namespace GFGGame
                     int[][] rewards = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(response.CardId, response.CardStar).rewardsArr;
                     BonusController.TryShowBonusList(rewards);
                     EventAgent.DispatchEvent(ConstMessage.CARD_STAR_REWARD);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -1,5 +1,18 @@
 using System.Collections.Generic;
 using ET;
+using GFGGame;
+
+namespace ET
+{
+    public class S2C_SyncRechargeItemGetHandler : AMHandler<S2C_SyncRechargeItemGet>
+    {
+        protected override async ETTask Run(Session session, S2C_SyncRechargeItemGet message)
+        {
+            var dTime = TimeHelper.ServerNow() - message.OrderTime;
+            ShopSProxy.OnBuySuccess(message.BuyId, message.Times, message.TotalTimes, dTime <= 5000);
+        }
+    }
+}
 
 namespace GFGGame
 {
@@ -30,35 +43,45 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ShopDataManager.Instance.UpdateGoodsData(response.BuyId, response.TotalTimes);
                     ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(response.BuyId);
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
-                    if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL && shopCfg.costType == CostType.RMB)
+                    if (shopCfg.costType == CostType.RMB)
                     {
-                        PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功");
-                    }
-
-                    List<ItemData> itemDatas;
-                    if (itemCfg.itemType == ConstItemType.USEABLE &&
-                        (itemCfg.subType == ConstItemSubType.USEABLE_AUTO))
-                    {
-                        itemDatas = ItemUtil.CreateItemDataList(itemCfg.itemsArr, response.Times * shopCfg.itemNum);
+                        QDManager.Pay(response.BuyId, response.Times, response.OrderId, response.Price);
+                        return false;
                     }
                     else
                     {
-                        itemDatas = ItemUtil.CreateItemDataList(itemCfg.id, response.Times * shopCfg.itemNum);
+                        OnBuySuccess(response.BuyId, response.Times, response.TotalTimes, true);
+                        return true;
                     }
-
-                    EventAgent.DispatchEvent(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, shopCfg);
-                    BonusController.TryShowBonusList(itemDatas);
-                    EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
-                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
-                    return true;
                 }
             }
             return false;
         }
 
+        public static void OnBuySuccess(int buyId, int times, int totalTimes, bool showItems)
+        {
+            ShopDataManager.Instance.UpdateGoodsData(buyId, totalTimes);
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(buyId);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+
+            EventAgent.DispatchEvent(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, shopCfg);
+            if(showItems)
+            {
+                //判断倍数
+                var multiple = 1;
+                if (totalTimes <= shopCfg.doubleTimes)
+                {
+                    multiple = 2;
+                }
+                List<ItemData> itemDatas = ItemUtil.CreateItemDataList(itemCfg.id, times * shopCfg.itemNum* multiple);
+                BonusController.TryShowBonusList(itemDatas);
+            }
+            EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+        }
+
         /**********************************************会员中心**********************************************/
         //领取VIP等级礼包
         public static async ETTask<bool> ReqGetVipGiftBag(int vipLv)

GameClient/Assets/Game/HotUpdate/ServerProxy/SkillSProxy.cs

@@ -47,6 +47,7 @@ namespace GFGGame
                 {
                     SkillDataManager.Instance.UpdateCardSkill(response.CardId, response.SkillId, response.SkillLvl);
                     EventAgent.DispatchEvent(ConstMessage.CARD_UP_SKILL);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

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

@@ -109,7 +109,7 @@ namespace GFGGame
             }
             return itemList;
         }
-        public static List<ItemData> CreateItemDataList(int[][] bonus, int num)
+        public static List<ItemData> CreateItemDataList(int[][] bonus, long num)
         {
             List<ItemData> itemList = new List<ItemData>();
             foreach (int[] item in bonus)

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanUpView.cs

@@ -46,11 +46,6 @@ namespace GFGGame
 
             this.clickBlankToClose = false;
 
-            _ui.m_c1.selectedIndex = rewardId > 0 ? 1 : 0;
-            if (rewardId > 0)
-            {
-                _ui.m_listFirstDanReward.numItems = cfg.bonusUpgradeArr.Length;
-            }
 
             cfg = ArenaRankCfgArray.Instance.GetCfg(curGrade);
             _ui.m_comCurDan.m_txtDanTitle.text = cfg.gradeName;
@@ -61,6 +56,11 @@ namespace GFGGame
             _ui.m_comLastDan.m_txtDanTitle.text = lastCfg.gradeName;
             ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comLastDan.m_loaDanIcon, lastCfg.id);
 
+            _ui.m_c1.selectedIndex = rewardId > 0 ? 1 : 0;
+            if (rewardId > 0)
+            {
+                _ui.m_listFirstDanReward.numItems = cfg.bonusUpgradeArr.Length;
+            }
             _ui.m_t0.Play(() =>
             {
                 this.clickBlankToClose = true;
@@ -88,7 +88,7 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).SetComItemScale = 0.7f;
+            (obj.data as ItemView).SetComItemScale = 0.85f;
             (obj.data as ItemView).SetTxtCountPos(185, 155);
         }
     }

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -105,7 +105,7 @@ namespace GFGGame
             listItem.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + data.itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_txtLv.text = data.lv + "级";
             listItem.m_txtName.text = data.itemCfg.name;
-            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardSkillsRed(data.id) || RedDotDataManager.Instance.GetCardStarReward(data.id), "", 10, -4);
+            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardRed(data.id), "", 10, -4);
 
             listItem.m_txtStarLv.text = data.star.ToString();
             //           UI_ComStar comStar = UI_ComStar.Proxy(listItem.m_comStar);

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -133,7 +133,6 @@ namespace GFGGame
             this.UpdateUpSkillView();
             this.UpdateRedDot();
             _comFosterBottom.m_ctrlTab.selectedIndex = this._selectTab;
-            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id));
 
             List<CardStarCfg> cardStarCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(_cardData.id);
             for (int i = 0; i < cardStarCfgs.Count; i++)
@@ -151,7 +150,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.CARD_UP_SKILL, UpdateUpSkillView);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
-            EventAgent.AddEventListener(ConstMessage.CARD_STAR_REWARD, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
 
         }
         private void ClearItemsCountList()
@@ -423,6 +422,7 @@ namespace GFGGame
                 }
                 return false;
             }
+
             if (IsUpLvLimit(itemId, false)) return false;
             itemsCount[index] = itemsCount[index] + 1;
             listItem.m_txtUseCount.text = itemsCount[index].ToString();
@@ -471,16 +471,19 @@ namespace GFGGame
         }
         private void OnClcikBtnAll()
         {
+            int cardUpLvGoldsNeed = 0;
             for (int i = 0; i < itemsCount.Count; i++)
             {
-                // if (IsUpLvLimit()) break;
+                int[] cardUpLvGolds = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[i]).cardUpLvGoldsArr[_cardData.itemCfg.rarity - 1];
                 long itemNum = ItemDataManager.GetItemNum(upgradeCardItemsArr[i]);
                 for (long j = 0; j < itemNum; j++)
                 {
-                    if (this.OnClickBtnPlusLvConsume(_comFosterBottom.m_listLvConsume.GetChildAt(i), false) == false)
+
+                    if (ItemDataManager.GetItemNum(cardUpLvGolds[0]) < cardUpLvGoldsNeed + cardUpLvGolds[1] || this.OnClickBtnPlusLvConsume(_comFosterBottom.m_listLvConsume.GetChildAt(i), false) == false)
                     {
                         break;
                     }
+                    cardUpLvGoldsNeed += cardUpLvGolds[1];
                 }
             }
         }
@@ -615,7 +618,7 @@ namespace GFGGame
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 0;
                 // List<CardStarCfg> starCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(_cardData.id);
 
-                _comFosterBottom.m_btnUpStar.data = 0;//data  0:可以升级，1：材料不足
+                _comFosterBottom.m_btnUpStar.data = 0;//data  0:材料不足，1：可以升级
 
                 ItemUtil.UpdateItemNeedNum(_comFosterBottom.m_comStarCousumeGold, cardStarCfg.costID, cardStarCfg.costNum);
 
@@ -623,7 +626,7 @@ namespace GFGGame
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
                 _comFosterBottom.m_txtTips.text = _cardData.lv < cardStarCfg.needLv ? string.Format("需等级达到{0}级", cardStarCfg.needLv) : "";
                 _comFosterBottom.m_comStarCousumeGold.visible = _cardData.lv >= cardStarCfg.needLv;
-                _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 1 ? true : false;
+                _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 0 ? true : false;
                 // _comFosterBottom.m_btnUpStar.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpStar.grayed;
 
             }
@@ -651,10 +654,11 @@ namespace GFGGame
             // listItem.m_btnPlus.data = cardStarCfg.materiarsArr[index][0];
             listItem.target.data = cardStarCfg.materiarsArr[index][0];
 
+            _comFosterBottom.m_btnUpStar.data = hasCount >= needCount && ItemDataManager.GetItemNum(cardStarCfg.costID) >= cardStarCfg.costNum ? 1 : 0;
+
             if (hasCount < needCount)
             {
                 //材料不足显示加号
-                _comFosterBottom.m_btnUpStar.data = 1;
                 listItem.m_btnPlus.visible = true;
             }
         }
@@ -709,7 +713,7 @@ namespace GFGGame
             }
 
             int state = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString());
-            if (state == 1)
+            if (state == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("材料不足");
                 return;
@@ -748,7 +752,7 @@ namespace GFGGame
 
         private void UpdateUpSkillView()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id));
+            // RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id));
             _comFosterBottom.m_listSkill.numItems = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id).Count;
             _comFosterBottom.m_listSkill.selectedIndex = 0;
             _comFosterBottom.m_ctrlSkillCount.selectedIndex = _comFosterBottom.m_listSkill.numItems;
@@ -909,6 +913,14 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_ComFosterTop.m_btnStarReward, RedDotDataManager.Instance.GetCardStarReward(_cardData.id));
+
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnUpLv, RedDotDataManager.Instance.GetCardUpLvRed(_cardData.id), "", -74, 60);
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnUpStar, RedDotDataManager.Instance.GetCardUpStarRed(_cardData.id), "", -74, 60);
+
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnLv, RedDotDataManager.Instance.GetCardUpLvRed(_cardData.id), "", 0, 0);
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnStar, RedDotDataManager.Instance.GetCardUpStarRed(_cardData.id), "", 0, 0);
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id), "", 0, 0);
+
         }
         protected override void OnHide()
         {
@@ -929,7 +941,7 @@ namespace GFGGame
             // EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChangeListener);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
             EventAgent.RemoveEventListener(ConstMessage.CARD_UP_SKILL, UpdateUpSkillView);
-            EventAgent.RemoveEventListener(ConstMessage.CARD_STAR_REWARD, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
 
         private void CheckGuide(object param)

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -159,20 +159,10 @@ namespace GFGGame
                 return;
             }
 
-            //合成材料判断
-            _materiarsOfSelectedItem = ItemUtil.CreateItemDataList(itemCfg.syntheticMateriarsArr);
-            int count = _materiarsOfSelectedItem.Count;
-            for (int i = 0; i < count; i++)
+            if (!RedDotDataManager.Instance.CheckCanSynthetic(_selectedItemId))
             {
-                ItemData itemData = _materiarsOfSelectedItem[i];
-                ItemCfg materialCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-                bool isDressUp = materialCfg.itemType == ConstItemType.DRESS_UP;
-                long numSynthetic = ItemDataManager.GetItemNum(itemData.id);
-                if (numSynthetic < itemData.num)
-                {
-                    PromptController.Instance.ShowFloatTextPrompt("材料不足", MessageType.WARNING);
-                    return;
-                }
+                PromptController.Instance.ShowFloatTextPrompt("材料不足", MessageType.WARNING);
+                return;
             }
 
             bool result = await ClothingSyntheticSProxy.ClothtingSynthetic(_selectedItemId);
@@ -196,6 +186,8 @@ namespace GFGGame
             string itemName = itemCfg.name;
             listItem.m_txtName.text = itemName;
             listItem.m_imgOwned.visible = ItemDataManager.GetItemNum(itemId) > 0;
+
+            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.CheckCanSynthetic(itemId), "", -18, 20);
             UI_ClothingListItem.ProxyEnd();
         }
 
@@ -366,6 +358,7 @@ namespace GFGGame
             UI_ClothingListItem selectedItem = UI_ClothingListItem.Proxy(_selectedListItem);
             selectedItem.m_imgOwned.visible = ItemDataManager.GetItemNum(_selectedItemId) > 0;
             UI_ClothingListItem.ProxyEnd();
+            _ui.m_listClothing.numItems = _ui.m_listClothing.numItems;
             UpdateSelectedItemInfo();
         }
 
@@ -377,6 +370,8 @@ namespace GFGGame
             DressUpMenuSuitDataManager.GetSuitProgressBySuitId(_suitId, out count, out totalCount);
             _ui.m_txtProgress.text = string.Format("{0}/{1}", count, totalCount);
         }
+
+
         private void OnClickBtnHome()
         {
             GameController.GoBackToMainView();

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -29,14 +29,18 @@ namespace GFGGame
             // _comModel = UI_ComModel.Proxy(_com);
             _curTime = _turnTime;
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
+            _com.GetChild("loaMask").asLoader.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
             ChangeRes();
             Timers.inst.Remove(UpdateTime);
-            Timers.inst.Add(_turnTime, 0, UpdateTime);
+            if (_luckyBoxCfg.resArr.Length > 1 || _luckyBoxCfg.suitIdArr.Length > 1)
+            {
+                Timers.inst.Add(_turnTime, 0, UpdateTime);
+            }
         }
 
         private void UpdateTime(object param)
         {
-
+            _com.GetChild("loaMask").asLoader.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
             _bgIndex = _bgIndex + 1 == _luckyBoxCfg.bgResArr.Length ? 0 : _bgIndex + 1;
             if (_luckyBoxCfg.resArr.Length > 0)
             {
@@ -46,7 +50,9 @@ namespace GFGGame
             {
                 _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitIdArr.Length ? 0 : _modelIndex + 1;
             }
-            ChangeRes();
+
+            _com.GetTransition("t0").Play(ChangeRes);
+            // ChangeRes();
         }
 
         private void ChangeRes()
@@ -86,6 +92,8 @@ namespace GFGGame
                     _comModel.m_holder.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
                 }
             }
+            _comModel.m_t1.Play();
+            // _com.GetTransition("t1").Play();
             UI_ComModel.ProxyEnd();
         }
         public void OnHide()

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs

@@ -13,7 +13,14 @@ namespace GFGGame
     {
         private UI_DailySupplyUI _ui;
         // private ValueBarController _valueBarController;
-
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GameObject _gameObject3;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private GoWrapper _wrapper3;
         private int _signCount;
         private int _month;
         private int _day;
@@ -26,6 +33,10 @@ namespace GFGGame
             //     _valueBarController.Dispose();
             //     _valueBarController = null;
             // }
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -42,11 +53,22 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
-            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            viewAnimationType = EnumViewAnimationType.None;
             // _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             // _ui.m_btnback.onClick.Add(OnBtnBackClick);
-
+            UpdateEffect();
+        }
+        private void UpdateEffect()
+        {
+            string resPath = ResPathUtil.GetViewEffectPath("ui_Activity", "Time_thing_book");
+            SceneController.AddObjectToView(null, null, _ui.m_holder, resPath, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Time_thing_hudie");
+            SceneController.AddObjectToView(null, null, _ui.m_comSupply.m_holder, resPath1, out _gameObject1, out _wrapper1);
+
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Time_thing_zhuti");
+            SceneController.AddObjectToView(null, null, _ui.m_comSupply.m_comSupply0.m_holder, resPath2, out _gameObject2, out _wrapper2);
+            SceneController.AddObjectToView(null, null, _ui.m_comSupply.m_comSupply1.m_holder, resPath2, out _gameObject3, out _wrapper3);
         }
         protected override void AddEventListener()
         {
@@ -60,12 +82,14 @@ namespace GFGGame
             _month = TimeUtil.GetCurMonth();
             _day = TimeUtil.GetCurDay();
             UpdateSupplyView();
+            _ui.m_t0.Play();
         }
 
         protected override void OnHide()
         {
             // _valueBarController.OnHide();
             base.OnHide();
+            _ui.m_t0.Stop();
         }
         protected override void RemoveEventListener()
         {
@@ -84,8 +108,8 @@ namespace GFGGame
 
         private void UpdateSupplyView()
         {
-            UpdateReward(_ui.m_comSupply0.target, DailySupplyCfgArray.Instance.dataArray[0].id);
-            UpdateReward(_ui.m_comSupply1.target, DailySupplyCfgArray.Instance.dataArray[1].id);
+            UpdateReward(_ui.m_comSupply.m_comSupply0.target, DailySupplyCfgArray.Instance.dataArray[0].id);
+            UpdateReward(_ui.m_comSupply.m_comSupply1.target, DailySupplyCfgArray.Instance.dataArray[1].id);
         }
 
 
@@ -93,7 +117,7 @@ namespace GFGGame
         {
             DailySupplyCfg supplyCfg = DailySupplyCfgArray.Instance.GetCfg(id);
 
-            UI_ComSupply item = UI_ComSupply.Proxy(obj);
+            UI_ComSupplyItem item = UI_ComSupplyItem.Proxy(obj);
 
             long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
             long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
@@ -132,7 +156,7 @@ namespace GFGGame
                 item.m_btnGet.onClick.Add(OnBtnGetSupplyClick);
             }
             item.m_btnGet.data = supplyCfg;
-            UI_ComSupply.ProxyEnd();
+            UI_ComSupplyItem.ProxyEnd();
         }
         private void OnBtnGetSupplyClick(EventContext context)
         {

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -12,6 +12,7 @@ namespace GFGGame
     {
         private UI_DailyWelfareUI _ui;
         private ValueBarController _valueBarController;
+        private List<ActivityInfo> _limitChargeInfo = new List<ActivityInfo>();
 
         private int _signCount;
         private int _month;
@@ -45,7 +46,8 @@ namespace GFGGame
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             // _ui.m_list.itemRenderer = ListItemRender;
-            _ui.m_comList.m_btnLimitChargeAddUp.target.onClick.Add(OnBtnLimitChargeAddUpClick);
+            // _ui.m_comList.m_btnLimitChargeAddUp.target.onClick.Add(OnBtnLimitChargeAddUpClick);
+            _ui.m_comList.m_listLimitCharge.itemRenderer = RenderListLimitChargeItem;
             _ui.m_comList.m_btnSevenDayLogin.target.onClick.Add(OnBtnSevenDayLoginClick);
             _ui.m_comList.m_btnSign.target.onClick.Add(OnBtnSignClick);
             _ui.m_comList.m_btnSupply.target.onClick.Add(OnBtnSupplyClick);
@@ -67,15 +69,11 @@ namespace GFGGame
             _ui.m_comList.m_btnSevenDayLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
             || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
 
-            _ui.m_comList.m_btnLimitChargeAddUp.target.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
-            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
-            if (ActivityDataManager.Instance.actLimitChargeId > 0)
-            {
-                _ui.m_comList.m_btnLimitChargeAddUp.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
-                _ui.m_comList.m_btnLimitChargeAddUp.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
-            }
+            _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
+            _ui.m_comList.m_listLimitCharge.numItems = _limitChargeInfo.Count;
+            _ui.m_comList.m_listLimitCharge.ResizeToFit();
 
-            if (ActivityDataManager.Instance.actLimitChargeId > 0)
+            if (_limitChargeInfo.Count > 0)
             {
                 Timers.inst.Add(1, 0, UpdateTime);
             }
@@ -97,22 +95,48 @@ namespace GFGGame
         {
             if (ActivityDataManager.Instance.actLimitChargeId > 0)
             {
-                ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
-                long curTime = TimeHelper.ServerNow();
-                long endTime = activityInfo.EndTime;
-                if (curTime < endTime)
+                for (int i = 0; i < _limitChargeInfo.Count; i++)
                 {
-                    _ui.m_comList.m_btnLimitChargeAddUp.m_txtTime.text = string.Format("剩余时间:{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
+                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_limitChargeInfo[i].ActivityId);
+                    long curTime = TimeHelper.ServerNow();
+                    long endTime = activityInfo.EndTime;
+                    if (curTime < endTime)
+                    {
+                        GTextField txtTime = _ui.m_comList.m_listLimitCharge.GetChildAt(i).asCom.GetChild("txtTime").asTextField;
+                        txtTime.text = string.Format("剩余时间:{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
+                    }
                 }
             }
         }
+        private void RenderListLimitChargeItem(int index, GObject obj)
+        {
+
+            // _ui.m_comList.m_btnLimitChargeAddUp.target.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
+            UI_Button1 item = UI_Button1.Proxy(obj);
+            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(_limitChargeInfo[index].ActivityId);
+            item.m_c1.selectedIndex = 1;
+            item.m_c2.selectedIndex = 0;
+            if (ActivityDataManager.Instance.actLimitChargeId > 0)
+            {
+                item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
+                item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
+            }
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnBtnLimitChargeAddUpClick);
+            }
+            item.target.data = _limitChargeInfo[index].ActivityId;
+            UI_Button1.ProxyEnd();
+        }
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);
         }
-        private void OnBtnLimitChargeAddUpClick()
+        private void OnBtnLimitChargeAddUpClick(EventContext context)
         {
-            ViewManager.Show<LimitChargeView>(null, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
+            GObject gObject = context.sender as GObject;
+
+            ViewManager.Show<LimitChargeView>(new object[] { gObject.data }, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
         }
         private void OnBtnSevenDayLoginClick()
         {
@@ -128,7 +152,11 @@ namespace GFGGame
         }
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnLimitChargeAddUp.target, RedDotDataManager.Instance.GetLimiteChargeRewardRed(), "", -40);
+            for (int i = 0; i < _limitChargeInfo.Count; i++)
+            {
+                GComponent item = _ui.m_comList.m_listLimitCharge.GetChildAt(i).asCom;
+                RedDotController.Instance.SetComRedDot(item, RedDotDataManager.Instance.GetLimiteChargeRewardRed(_limitChargeInfo[i].ActivityId), "", -40);
+            }
             RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnSevenDayLogin.target, RedDotDataManager.Instance.GetSevenDayLoginRed(), "", -40);
             RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnSign.target, RedDotDataManager.Instance.DailySignRed(), "", -40);
             RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnSupply.target, RedDotDataManager.Instance.DailySupplyRed(), "", -40);

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -12,7 +12,7 @@ namespace GFGGame
     {
         private UI_LimitChargeUI _ui;
         private List<ActivityRechargeCfg> _rechargeCfgs;
-
+        private int _activityId = 0;
         private ActivityInfo _activityInfo;
 
         public override void Dispose()
@@ -37,9 +37,6 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnCharge.onClick.Add(OnBtnChargeClick);
-            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(openCfg.res);
-
         }
         protected override void AddEventListener()
         {
@@ -51,11 +48,10 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
+            _activityId = (int)(this.viewData as object[])[0];
+            _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
             UpdateView();
 
-            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
-
             Timers.inst.Add(1, 0, UpdateTime);
 
         }
@@ -89,10 +85,10 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
+            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);
             _rechargeCfgs = SoreCfg(_rechargeCfgs);
             _ui.m_list.numItems = _rechargeCfgs.Count;
-            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
+            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xslc_banner_" + openCfg.res);
         }
         private void RenderListItem(int index, GObject obj)
@@ -141,7 +137,7 @@ namespace GFGGame
         {
             GObject obj = context.sender as GObject;
             int id = (int)obj.data;
-            ActivityGlobalSProxy.ReqGetActivityBonus(ActivityDataManager.Instance.actLimitChargeId, id).Coroutine();
+            ActivityGlobalSProxy.ReqGetActivityBonus(_activityId, id).Coroutine();
         }
         private List<ActivityRechargeCfg> SoreCfg(List<ActivityRechargeCfg> rechargeCfgs)
         {

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

@@ -73,14 +73,17 @@ namespace GFGGame
 
             _ui.m_btnSearch.visible = true;
             _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高分优先", "低分优先" };
+            _ui.m_partsListSearch.m_comboBoxRarity.items = new string[] { "高分优先", "低分优先" };
             InitLists();
             _ui.m_partsList.m_comboBoxRarity.onChanged.Add(OnComboBoxRarityChanged);
+            _ui.m_partsListSearch.m_comboBoxRarity.onChanged.Add(OnSearchComboBoxRarityChanged);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
 
             _ui.m_comListType1.m_listType.onClickItem.Add(OnClickListType1Item);
             _ui.m_comListType2.m_listType.onClickItem.Add(OnClickListType2Item);
             _ui.m_partsList.m_list.onClickItem.Add(OnClickPartsListItem);
             _ui.m_partsList2.m_list.onClickItem.Add(OnClickSuitPartsListItem);
+            _ui.m_partsListSearch.m_list.onClickItem.Add(OnClickSearchPartsListItem);
 
             _ui.m_touchPad.onClick.Add(OnTouchPad);
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
@@ -98,9 +101,10 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.AddEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         protected override void OnShown()
         {
@@ -165,10 +169,10 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
-            EventAgent.AddEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
-
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         private void OnClickBtnBack()
         {
@@ -275,6 +279,31 @@ namespace GFGGame
             this.hideListType2();
         }
 
+        private void OnClickSearchPartsListItem(EventContext context)
+        {
+            if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
+            {
+                return;
+            }
+            GObject listItem = context.data as GObject;
+            int id = (int)listItem.data;
+
+            bool isOrnament = DressUpMenuItemCfg1Array.Instance.CheckIsOrnamentsType(id);
+            bool isDress = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
+            bool isHasSame = MyDressUpHelper.dressUpObj.CheckSameTypeIsOn(id);
+            bool isMaxCount = MyDressUpHelper.GetCurrentOrnamentCount() >= GlobalCfgArray.globalCfg.dressLimitCount;
+            if (isOrnament && !isDress && !isHasSame && isMaxCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("饰品穿戴数量已达上限");
+                return;
+            }
+            MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+
+            _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
+            UpdateSearchListPartsSelected();
+            UpdateValueInfo();
+
+        }
         private void OnClickPartsListItem(EventContext context)
         {
             if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
@@ -362,6 +391,11 @@ namespace GFGGame
                 this.showListType1();
                 this.hideListType2();
             }
+            else if (this.currentListType == DressUpListType.List5)
+            {
+                this.showListType1();
+                this.hideSearchListType();
+            }
         }
 
 
@@ -427,6 +461,7 @@ namespace GFGGame
             _ui.m_comListType2.m_listType.itemRenderer = ListType2Item;
             _ui.m_partsList.m_list.itemRenderer = ListPartsItem;
             _ui.m_partsList2.m_list.itemRenderer = ListParts2Item;
+            _ui.m_partsListSearch.m_list.itemRenderer = ListPartsItem;
             listType1X = _ui.m_comListType1.target.x;
             partsListX = _ui.m_partsList.target.x - _ui.m_partsList.target.width;
             //一级菜单
@@ -529,6 +564,11 @@ namespace GFGGame
             _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
             this.UpdatePartsListSort();
         }
+        private void OnSearchComboBoxRarityChanged()
+        {
+            _scoreIndex = _ui.m_partsListSearch.m_comboBoxRarity.selectedIndex;
+            this.UpdateSearchList();
+        }
         private void UpdatePartsListSort()
         {
 
@@ -644,6 +684,70 @@ namespace GFGGame
                     _ui.m_partsList2.target.x = t.value.x;
                 });
         }
+        private void showSearchListType()
+        {
+            // _currentList2 = null;
+            currentListType = DressUpListType.List5;
+            GTween.To(_ui.target.width, partsListX, 0.5f)
+                .SetTarget(_ui.m_partsListSearch.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsListSearch.target.x = t.value.x;
+                });
+        }
+        private void hideSearchListType()
+        {
+            GTween.To(partsListX, _ui.target.width, 0.5f)
+                .SetTarget(_ui.m_partsListSearch.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsListSearch.target.x = t.value.x;
+                });
+        }
+        /*****************************************************************************************************/
+        private void DressResetSerch()
+        {
+            if (currentListType == DressUpListType.List5)
+            {
+                OnTouchPad();
+            }
+        }
+        private void UpdateSerch(EventContext context)
+        {
+            if (context.data.ToString() == ConstMessage.DRESS_SEARCH)
+            {
+                _currentList3 = DressUpMenuItemDataManager.DressSearch(false);
+            }
+            else if (context.data.ToString() == ConstMessage.DRESS_FILTER)
+            {
+                _currentList3 = DressUpMenuItemDataManager.DressFilter(false);
+            }
+            ViewManager.Hide<ModalStatusView>();
+            UpdateSearchList();
+            if (currentListType != DressUpListType.List5)
+            {
+                hideListParts();
+                hideListParts2();
+                hideListType1();
+                hideListType2();
+                showSearchListType();
+            }
+            _currentMenuType = 0;
+        }
+        private void UpdateSearchList()
+        {
+
+            if (_scoreIndex == SORT_BY_HIGH_SCORE)
+            {
+                _currentList3 = DressUpMenuItemDataManager.SortItemListByHighScore(_currentList3, true);
+            }
+            else if (_scoreIndex == SORT_BY_LOW_SCORE)
+            {
+                _currentList3 = DressUpMenuItemDataManager.SortItemListByLowScore(_currentList3, true);
+            }
+            _currentMenuType = 0;
+            _ui.m_partsListSearch.m_list.numItems = _currentList3.Count; ;
+        }
         private void ListType1Item(int index, GObject item)
         {
             UI.DressUp.UI_TypeItem typeItem = UI.DressUp.UI_TypeItem.Proxy(item);
@@ -768,6 +872,30 @@ namespace GFGGame
 
 
         }
+        private void UpdateSearchListPartsSelected()
+        {
+            int count = _ui.m_partsListSearch.m_list.numChildren;
+            int suitId = MyDressUpHelper.dressUpObj.suitId;
+
+            for (int i = 0; i < count; i++)
+            {
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsListSearch.m_list.GetChildAt(i));
+                int id = (int)listItem.target.data;
+                if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
+                {
+                    listItem.m_iconSelected.visible = suitId > 0 && id == suitId;
+                }
+                else
+                {
+                    bool isPutOn = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);//非套装金判断是否穿戴
+                    var isSceneType = DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(id);
+                    bool isSuit = !isSceneType && suitId > 0 && SuitCfgArray.Instance.GetSuitIdOfItem(id) == suitId;//非场景类， 若当前穿戴套装要判断item是否属于套装(更换场景类不会改变套装穿戴状态)
+                    bool isSceneSuit = isSceneType && suitId > 0 && isPutOn;//场景类， 若当前穿戴套装要判断item是否属已穿戴
+                    listItem.m_iconSelected.visible = isPutOn || isSuit || isSceneSuit;
+                }
+                UI_PartsListItem.ProxyEnd();
+            }
+        }
         private void UpdateListPartsSelected()
         {
             int count = _ui.m_partsList.m_list.numChildren;

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

@@ -96,7 +96,7 @@ namespace GFGGame
             item.text = tagCfg.name;
             item.icon = "ui://DressUp/sxsx_fgdi_" + tagCfg.type;
             // item.data = 
-            string data = string.Format("{0}_{1}", tagCfg.type, tagCfg.name);
+            string data = tagCfg.name;// string.Format("{0}_{1}", tagCfg.type, tagCfg.name);
             item.data = data;
             item.selected = _selectTagList.IndexOf(data) >= 0;
         }
@@ -168,19 +168,21 @@ namespace GFGGame
             {
                 return;
             }
+            ViewManager.Show<ModalStatusView>("搜索中...");
             DressUpMenuItemDataManager.dressSearchTxt = _ui.m_txtInput.text;
-            EventAgent.DispatchEvent(ConstMessage.DRESS_SEARCH);
+            EventAgent.DispatchEvent(ConstMessage.DRESS_SEARCH, ConstMessage.DRESS_SEARCH);
             ResetFilter();
             this.OnHide();
 
         }
         private void OnClickBtnConfirm()
         {
+            ViewManager.Show<ModalStatusView>("搜索中...");
             DressUpMenuItemDataManager.dressFilterType = DressFilterType.Filter;
             DressUpMenuItemDataManager.selectRarityList = _selectRarityList;
             DressUpMenuItemDataManager.selectScoreList = _selectScoreList;
             DressUpMenuItemDataManager.selectTagList = _selectTagList;
-            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER);
+            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER, ConstMessage.DRESS_FILTER);
             ResetSearch();
             this.OnHide();
         }
@@ -189,7 +191,7 @@ namespace GFGGame
             ResetFilter();
             ResetSearch();
             DressUpMenuItemDataManager.dressFilterType = DressFilterType.None;
-            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER);
+            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER_RESET);
         }
         private void ResetFilter()
         {

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

@@ -75,8 +75,10 @@ namespace GFGGame
             _ui.m_btnSearch.visible = true;
             // _ui.m_comboBox.items = new string[] { "我的套装一", "我的套装二", "我的套装三", "我的套装四", "我的套装五", "我的套装六" };
             _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高分优先", "低分优先" };
+            _ui.m_partsListSearch.m_comboBoxRarity.items = new string[] { "高分优先", "低分优先" };
             InitLists();
             _ui.m_partsList.m_comboBoxRarity.onChanged.Add(OnComboBoxRarityChanged);
+            _ui.m_partsListSearch.m_comboBoxRarity.onChanged.Add(OnSearchComboBoxRarityChanged);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
             // _ui.m_btnClothingShop.onClick.Add(OnClickBtnClothingShop);
@@ -85,6 +87,7 @@ namespace GFGGame
             _ui.m_comListType2.m_listType.onClickItem.Add(OnClickListType2Item);
             _ui.m_partsList.m_list.onClickItem.Add(OnClickPartsListItem);
             _ui.m_partsList2.m_list.onClickItem.Add(OnClickSuitPartsListItem);
+            _ui.m_partsListSearch.m_list.onClickItem.Add(OnClickSearchPartsListItem);
             _ui.m_touchPad.onClick.Add(OnTouchPad);
             _ui.m_btnHint.onClick.Add(OnClickBtnHint);
             // _ui.m_btnGuide.onClick.Add(OnTouchPad);
@@ -114,8 +117,10 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
-            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
             // EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
 
         }
@@ -218,8 +223,10 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
             // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
 
         }
@@ -312,7 +319,31 @@ namespace GFGGame
             }
             this.hideListType2();
         }
+        private void OnClickSearchPartsListItem(EventContext context)
+        {
+            if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
+            {
+                return;
+            }
+            GObject listItem = context.data as GObject;
+            int id = (int)listItem.data;
 
+            bool isOrnament = DressUpMenuItemCfg1Array.Instance.CheckIsOrnamentsType(id);
+            bool isDress = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
+            bool isHasSame = MyDressUpHelper.dressUpObj.CheckSameTypeIsOn(id);
+            bool isMaxCount = MyDressUpHelper.GetCurrentOrnamentCount() >= GlobalCfgArray.globalCfg.dressLimitCount;
+            if (isOrnament && !isDress && !isHasSame && isMaxCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("饰品穿戴数量已达上限");
+                return;
+            }
+            MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+
+            _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
+            UpdateSearchListPartsSelected();
+
+            UpdateScore();
+        }
         private void OnClickPartsListItem(EventContext context)
         {
             if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
@@ -400,6 +431,11 @@ namespace GFGGame
                 this.showListType1();
                 this.hideListType2();
             }
+            else if (this.currentListType == DressUpListType.List5)
+            {
+                this.showListType1();
+                this.hideSearchListType();
+            }
         }
 
         private void OnClickBtnHint()
@@ -546,6 +582,7 @@ namespace GFGGame
             _ui.m_comListType2.m_listType.itemRenderer = ListType2Item;
             _ui.m_partsList.m_list.itemRenderer = ListPartsItem;
             _ui.m_partsList2.m_list.itemRenderer = ListParts2Item;
+            _ui.m_partsListSearch.m_list.itemRenderer = ListPartsItem;
             listType1X = _ui.m_comListType1.target.x;
             partsListX = _ui.m_partsList.target.x - _ui.m_partsList.target.width;
             //一级菜单
@@ -648,6 +685,11 @@ namespace GFGGame
             _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
             this.UpdatePartsListSort();
         }
+        private void OnSearchComboBoxRarityChanged()
+        {
+            _scoreIndex = _ui.m_partsListSearch.m_comboBoxRarity.selectedIndex;
+            this.UpdateSearchList();
+        }
         private void UpdatePartsListSort()
         {
 
@@ -686,14 +728,14 @@ namespace GFGGame
                 }
 
             }
-            if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
-            {
-                _currentList3 = DressUpMenuItemDataManager.DressSearch(_currentList3);
-            }
-            else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
-            {
-                _currentList3 = DressUpMenuItemDataManager.DressFilter(_currentList3);
-            }
+            // if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
+            // {
+            //     _currentList3 = DressUpMenuItemDataManager.DressSearch(_currentList3);
+            // }
+            // else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
+            // {
+            //     _currentList3 = DressUpMenuItemDataManager.DressFilter(_currentList3);
+            // }
 
             //必穿品放在列表最前面
             if (_fightCfg.needItemId > 0)
@@ -726,14 +768,14 @@ namespace GFGGame
 
             _currentList4 = new List<int>(SuitCfgArray.Instance.GetSuitItems(_currentSuitId, true));
 
-            if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
-            {
-                _currentList4 = DressUpMenuItemDataManager.DressSearch(_currentList4);
-            }
-            else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
-            {
-                _currentList4 = DressUpMenuItemDataManager.DressFilter(_currentList4);
-            }
+            // if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
+            // {
+            //     _currentList4 = DressUpMenuItemDataManager.DressSearch(_currentList4);
+            // }
+            // else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
+            // {
+            //     _currentList4 = DressUpMenuItemDataManager.DressFilter(_currentList4);
+            // }
 
             _ui.m_partsList2.m_list.RemoveChildrenToPool();
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
@@ -783,6 +825,71 @@ namespace GFGGame
                     _ui.m_partsList2.target.x = t.value.x;
                 });
         }
+
+        private void showSearchListType()
+        {
+            // _currentList2 = null;
+            currentListType = DressUpListType.List5;
+            GTween.To(_ui.target.width, partsListX, 0.5f)
+                .SetTarget(_ui.m_partsListSearch.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsListSearch.target.x = t.value.x;
+                });
+        }
+        private void hideSearchListType()
+        {
+            GTween.To(partsListX, _ui.target.width, 0.5f)
+                .SetTarget(_ui.m_partsListSearch.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsListSearch.target.x = t.value.x;
+                });
+        }
+        /*****************************************************************************************************/
+        private void DressResetSerch()
+        {
+            if (currentListType == DressUpListType.List5)
+            {
+                OnTouchPad();
+            }
+        }
+        private void UpdateSerch(EventContext context)
+        {
+            if (context.data.ToString() == ConstMessage.DRESS_SEARCH)
+            {
+                _currentList3 = DressUpMenuItemDataManager.DressSearch(false);
+            }
+            else if (context.data.ToString() == ConstMessage.DRESS_FILTER)
+            {
+                _currentList3 = DressUpMenuItemDataManager.DressFilter(false);
+            }
+            ViewManager.Hide<ModalStatusView>();
+            UpdateSearchList();
+            if (currentListType != DressUpListType.List5)
+            {
+                hideListParts();
+                hideListParts2();
+                hideListType1();
+                hideListType2();
+                showSearchListType();
+            }
+            _currentMenuType = 0;
+        }
+        private void UpdateSearchList()
+        {
+
+            if (_scoreIndex == SORT_BY_HIGH_SCORE)
+            {
+                _currentList3 = DressUpMenuItemDataManager.SortItemListByHighScore(_currentList3, true);
+            }
+            else if (_scoreIndex == SORT_BY_LOW_SCORE)
+            {
+                _currentList3 = DressUpMenuItemDataManager.SortItemListByLowScore(_currentList3, true);
+            }
+            _currentMenuType = 0;
+            _ui.m_partsListSearch.m_list.numItems = _currentList3.Count; ;
+        }
         private void ListType1Item(int index, GObject item)
         {
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
@@ -931,6 +1038,30 @@ namespace GFGGame
                 UI_PartsListItem.ProxyEnd();
             }
         }
+        private void UpdateSearchListPartsSelected()
+        {
+            int count = _ui.m_partsListSearch.m_list.numChildren;
+            int suitId = MyDressUpHelper.dressUpObj.suitId;
+
+            for (int i = 0; i < count; i++)
+            {
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsListSearch.m_list.GetChildAt(i));
+                int id = (int)listItem.target.data;
+                if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
+                {
+                    listItem.m_iconSelected.visible = suitId > 0 && id == suitId;
+                }
+                else
+                {
+                    bool isPutOn = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);//非套装金判断是否穿戴
+                    var isSceneType = DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(id);
+                    bool isSuit = !isSceneType && suitId > 0 && SuitCfgArray.Instance.GetSuitIdOfItem(id) == suitId;//非场景类， 若当前穿戴套装要判断item是否属于套装(更换场景类不会改变套装穿戴状态)
+                    bool isSceneSuit = isSceneType && suitId > 0 && isPutOn;//场景类， 若当前穿戴套装要判断item是否属已穿戴
+                    listItem.m_iconSelected.visible = isPutOn || isSuit || isSceneSuit;
+                }
+                UI_PartsListItem.ProxyEnd();
+            }
+        }
         private void UpdateListSuitPartsSelected()
         {
             int count = _ui.m_partsList2.m_list.numChildren;

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

@@ -2,9 +2,10 @@ namespace GFGGame
 {
     public enum DressUpListType
     {
-        List1,
-        List2,
-        List3,
-        List4
+        List1,//主菜单
+        List2,//二级菜单
+        List3,//部件列表
+        List4,//套装部件
+        List5//筛选列表
     }
 }

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

@@ -77,6 +77,7 @@ namespace GFGGame
 
             // _ui.m_comboBox.items = new string[] { "我的套装一", "我的套装二", "我的套装三", "我的套装四", "我的套装五", "我的套装六" };
             _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高稀有度", "低稀有度", "最近获得" };
+            _ui.m_partsListSearch.m_comboBoxRarity.items = new string[] { "高稀有度", "低稀有度", "最近获得" };
 
             InitLists();
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
@@ -89,10 +90,12 @@ namespace GFGGame
             // _ui.m_partsList.m_list.SetVirtual();
             _ui.m_partsList.m_list.onClickItem.Add(OnClickPartsListItem);
             _ui.m_partsList2.m_list.onClickItem.Add(OnClickSuitPartsListItem);
+            _ui.m_partsListSearch.m_list.onClickItem.Add(OnClickPartsListItem);
             _ui.m_touchPad.onClick.Add(OnTouchPad);
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
             _ui.m_btnSave.onClick.Add(OnClickBtnSave);
             _ui.m_partsList.m_comboBoxRarity.onChanged.Add(OnComboBoxRarityChanged);
+            _ui.m_partsListSearch.m_comboBoxRarity.onChanged.Add(OnSearchComboBoxRarityChanged);
             _ui.m_btnAction.onClick.Add(OnClickBtnAction);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
             _ui.m_btnNext.onClick.Add(OnClickBtnNext);
@@ -107,12 +110,32 @@ namespace GFGGame
             _ui.m_partsList2.m_imgTop.visible = true;
             _ui.m_partsList.m_imgTop.visible = false;
         }
+        private void InitLists()
+        {
+            _ui.m_comListType2.m_listType.itemRenderer = ListType2Item;
+            _ui.m_partsList.m_list.itemRenderer = ListPartsItem;
+            _ui.m_partsList2.m_list.itemRenderer = ListParts2Item;
+            _ui.m_partsListSearch.m_list.itemRenderer = ListPartsItem;
+            listType1X = _ui.m_comListType1.target.x;
+            partsListX = _ui.m_partsList.target.x - _ui.m_partsList.target.width;// - DressUpView.RIGHT_BLANK;
+            //一级菜单
+            _ui.m_comListType1.m_listType.itemRenderer = ListType1Item;
+            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length;
+            //_ui.m_comListType1.m_listType1.ResizeToFit(_ui.m_comListType1.m_listType1.numItems);
+            float maxHeight = _ui.target.height - _ui.m_comListType1.target.y - DressUpView.BOTTOM_BLANK;
+            if (_ui.m_comListType1.m_listType.height > maxHeight)
+            {
+                _ui.m_comListType1.m_listType.height = maxHeight;
+            }
+        }
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.CLOSE_PHOTOGRAPHVIEW, UpdateScene);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         protected override void OnShown()
         {
@@ -165,6 +188,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.CLOSE_PHOTOGRAPHVIEW, UpdateScene);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         private void OnClickBtnBack()
         {
@@ -423,6 +447,16 @@ namespace GFGGame
                 this.showListType1();
                 this.hideListType2();
             }
+            else if (this.currentListType == DressUpListType.List4)
+            {
+                this.showListType1();
+                this.hideListType2();
+            }
+            else if (this.currentListType == DressUpListType.List5)
+            {
+                this.showListType1();
+                this.hideSearchListType();
+            }
             // _ui.m_comListType1.m_listType.numItems = _ui.m_comListType1.m_listType.numItems;
             // this.ShowSubList();
         }
@@ -446,6 +480,11 @@ namespace GFGGame
             _rarityIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
             this.UpdatePartsListSort();
         }
+        private void OnSearchComboBoxRarityChanged()
+        {
+            _rarityIndex = _ui.m_partsListSearch.m_comboBoxRarity.selectedIndex;
+            this.UpdateSearchList();
+        }
 
         private void OnClickBtnAction()
         {
@@ -456,23 +495,7 @@ namespace GFGGame
             ViewManager.Show<DressFilterView>(true, new object[] { ViewName.DRESS_UP_VIEW });
         }
 
-        private void InitLists()
-        {
-            _ui.m_comListType2.m_listType.itemRenderer = ListType2Item;
-            _ui.m_partsList.m_list.itemRenderer = ListPartsItem;
-            _ui.m_partsList2.m_list.itemRenderer = ListParts2Item;
-            listType1X = _ui.m_comListType1.target.x;
-            partsListX = _ui.m_partsList.target.x - _ui.m_partsList.target.width;// - DressUpView.RIGHT_BLANK;
-            //一级菜单
-            _ui.m_comListType1.m_listType.itemRenderer = ListType1Item;
-            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length;
-            //_ui.m_comListType1.m_listType1.ResizeToFit(_ui.m_comListType1.m_listType1.numItems);
-            float maxHeight = _ui.target.height - _ui.m_comListType1.target.y - DressUpView.BOTTOM_BLANK;
-            if (_ui.m_comListType1.m_listType.height > maxHeight)
-            {
-                _ui.m_comListType1.m_listType.height = maxHeight;
-            }
-        }
+
 
         private void showListType1()
         {
@@ -600,7 +623,6 @@ namespace GFGGame
         }
 
 
-
         private void showListParts2(int suitId)
         {
             _currentSuitId = suitId;
@@ -638,7 +660,71 @@ namespace GFGGame
                     _ui.m_partsList2.target.x = t.value.x;
                 });
         }
+
+        private void showSearchListType()
+        {
+            // _currentList2 = null;
+            currentListType = DressUpListType.List5;
+            GTween.To(_ui.target.width, partsListX, 0.5f)
+                .SetTarget(_ui.m_partsListSearch.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsListSearch.target.x = t.value.x;
+                });
+        }
+        private void hideSearchListType()
+        {
+            GTween.To(partsListX, _ui.target.width, 0.5f)
+                .SetTarget(_ui.m_partsListSearch.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsListSearch.target.x = t.value.x;
+                });
+        }
         /****************************************************************************************************************************/
+        private void DressResetSerch()
+        {
+            if (currentListType == DressUpListType.List5)
+            {
+                OnTouchPad();
+            }
+        }
+        private void UpdateSerch(EventContext context)
+        {
+            if (context.data.ToString() == ConstMessage.DRESS_SEARCH)
+            {
+                _currentList3 = DressUpMenuItemDataManager.DressSearch();
+            }
+            else if (context.data.ToString() == ConstMessage.DRESS_FILTER)
+            {
+                _currentList3 = DressUpMenuItemDataManager.DressFilter();
+            }
+            ViewManager.Hide<ModalStatusView>();
+            UpdateSearchList();
+            if (currentListType != DressUpListType.List5)
+            {
+                hideListParts();
+                hideListParts2();
+                hideListType1();
+                hideListType2();
+                showSearchListType();
+            }
+            _currentMenuType = 0;
+        }
+        private void UpdateSearchList()
+        {
+
+            if (_rarityIndex == SORT_BY_HIGH_RARITY)
+            {
+                _currentList3 = DressUpMenuItemDataManager.SortItemListByHighRarity(_currentList3);
+            }
+            else if (_rarityIndex == SORT_BY_LOW_RARITY)
+            {
+                _currentList3 = DressUpMenuItemDataManager.SortItemListByLowRarity(_currentList3);
+            }
+            _currentMenuType = 0;
+            _ui.m_partsListSearch.m_list.numItems = _currentList3.Count; ;
+        }
         private void ListType1Item(int index, GObject item)
         {
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
@@ -750,7 +836,7 @@ namespace GFGGame
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;
-            listItem.m_txtScore.visible = false;
+            listItem.m_grpScore.visible = false;
             //listItem.m_ScoreType.visible = true;
             listItem.m_imgNeed.visible = false;
 
@@ -794,7 +880,7 @@ namespace GFGGame
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, "png");
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;
-            listItem.m_txtScore.visible = false;
+            listItem.m_grpScore.visible = false;
             //listItem.m_ScoreType.visible = true;
             listItem.m_imgNeed.visible = false;
             bool isNew = DressUpMenuItemDataManager.CheckIsDressUpItemNew(id);
@@ -904,14 +990,14 @@ namespace GFGGame
                 }
 
             }
-            if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
-            {
-                _currentList3 = DressUpMenuItemDataManager.DressSearch(_currentList3);
-            }
-            else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
-            {
-                _currentList3 = DressUpMenuItemDataManager.DressFilter(_currentList3);
-            }
+            // if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
+            // {
+            //     _currentList3 = DressUpMenuItemDataManager.DressSearch(_currentList3);
+            // }
+            // else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
+            // {
+            //     _currentList3 = DressUpMenuItemDataManager.DressFilter(_currentList3);
+            // }
 
             _ui.m_partsList.m_list.RemoveChildrenToPool();
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
@@ -930,14 +1016,14 @@ namespace GFGGame
                 _currentList4.Add(_currentSuitId);
             }
 
-            if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
-            {
-                _currentList4 = DressUpMenuItemDataManager.DressSearch(_currentList4);
-            }
-            else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
-            {
-                _currentList4 = DressUpMenuItemDataManager.DressFilter(_currentList4);
-            }
+            // if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
+            // {
+            //     _currentList4 = DressUpMenuItemDataManager.DressSearch(_currentList4);
+            // }
+            // else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
+            // {
+            //     _currentList4 = DressUpMenuItemDataManager.DressFilter(_currentList4);
+            // }
 
             _ui.m_partsList2.m_list.RemoveChildrenToPool();
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs

@@ -36,7 +36,8 @@ namespace GFGGame
             _ui.m_btnMemberLog.onClick.Add(OnBtnMemberLogClick);
             _ui.m_btnExit.onClick.Add(OnBtnExitClick);
             _ui.m_btnExit1.onClick.Add(OnBtnExitClick);
-
+            _ui.m_comChairman.m_comHead.target.onClick.Add(OnShowOhterInfo);
+            _ui.m_comCoChairman.m_comHead.target.onClick.Add(OnShowOhterInfo);
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.SetVirtual();
 
@@ -201,6 +202,7 @@ namespace GFGGame
                 com.m_loaHeadBorder.url = "";
                 com.m_btnAppoint.visible = false;
                 com.m_loaTitle.url = "";
+                com.target.data = null;
             }
             else
             {
@@ -217,9 +219,23 @@ namespace GFGGame
                     com.m_btnAppoint.onClick.Add(OnBtnAppointClick);
                 }
                 com.m_btnAppoint.data = memberData;
+                com.m_comHead.target.data = roleId;
             }
             UI_ComLeader.Proxy();
         }
+
+        private async void OnShowOhterInfo(EventContext context)
+        {
+            GObject gObject = context.sender as GObject;
+            if (gObject.data == null)
+            {
+                return;
+            }
+            long roleId = (long)gObject.data;
+            OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(roleId);
+            OtherRoleInfoDetailData detailData = await RoleInfoSProxy.ReqOtherRoleDetailInfo(roleId);
+            ViewManager.Show<OtherRoleInfoView>(new object[] { roleInfoData, detailData }, new object[] { typeof(LeagueView).FullName, null });
+        }
         private void RenderListItem(int index, GObject obj)
         {
             LeagueMemberData memberData = _leagueData.LeagueMemberDatas[_memberIds[index]];
@@ -250,6 +266,11 @@ namespace GFGGame
                 item.m_btnAppoint.onClick.Add(OnBtnAppointClick);
             }
             item.m_btnAppoint.data = memberData;
+            if (item.m_comHead.data == null)
+            {
+                item.m_comHead.onClick.Add(OnShowOhterInfo);
+            }
+            item.m_comHead.data = memberData.RoleInfo.roleId;
             UI_ListMemberItem.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -21,6 +21,7 @@ namespace GFGGame
         private GoWrapper _wrapper2;
         private List<GameObject> _gameObjects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
+        private List<GComponent> _items = new List<GComponent>();
         private int _pageCount;
         private int _type;
         public override void Dispose()
@@ -28,10 +29,10 @@ namespace GFGGame
             SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
             SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
             SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
-            for (int i = 0; i < _gameObjects.Count; i++)
-            {
-                SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
-            }
+            // for (int i = 0; i < _gameObjects.Count; i++)
+            // {
+            //     SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
+            // }
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -83,8 +84,11 @@ namespace GFGGame
             _type = (int)this.viewData;
             _valueBarController.OnShown();
             _valueBarController.Controller(11);
-            _ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
-            _ui.m_t0.Play();
+            _ui.m_t0.Play(() =>
+            {
+                _ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
+            });
+
             UpdateView();
         }
 
@@ -93,10 +97,24 @@ namespace GFGGame
             base.OnHide();
             _valueBarController.OnHide();
             if (_ui.m_comSkill.m_list.numItems > 0) _ui.m_comSkill.m_list.ScrollToView(0);
+            _ui.m_comSkill.m_list.numItems = 0;
             _ui.m_t0.Stop();
             _ui.m_t1.Stop();
+
+            DestroySkillAni();
         }
+        private void DestroySkillAni()
+        {
+            for (int i = 0; i < _gameObjects.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
+                _items[i].RemoveChildAt(4);
+            }
+            _gameObjects.Clear();
+            _wrappers.Clear();
+            _items.Clear();
 
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -179,6 +197,10 @@ namespace GFGGame
             {
                 item.m_listSkill.itemRenderer = RenderListSkillItem;
             }
+            if (LeagueDataManager.Instance.CurLayer == index + 1)
+            {
+                DestroySkillAni();
+            }
             item.m_listSkill.data = skillCfgs;
             item.m_listSkill.numItems = skillCfgs.Count;
             UI_ListSkillLayerItem.ProxyEnd();
@@ -204,29 +226,27 @@ namespace GFGGame
             }
 
             item.m_imgSuo.visible = !canActive;
-            item.m_holder.visible = isLock && canActive;
-            if (isLock && canActive)
+
+            if (isLock && canActive && _gameObjects.Count <= index)
             {
-                GameObject gameObject;
-                GoWrapper wrapper;
-                if (_gameObjects.Count > index)
-                {
-                    gameObject = _gameObjects[index];
-                    wrapper = _wrappers[index];
-                }
+                GameObject gameObject = null;
+                GoWrapper wrapper = null;
+                GGraph holder = new GGraph();
+                holder.SetSize(1, 1);
+                holder.SetPosition(80, 80, 0);
+                holder.name = "holder";
+                item.target.AddChildAt(holder, 4);
                 string resPath = ResPathUtil.GetViewEffectPath("ui_league", "tea_nolearn");
-                SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject, out wrapper);
+                SceneController.AddObjectToView(gameObject, wrapper, holder, resPath, out gameObject, out wrapper, 100);
 
-                if (_gameObjects.Count <= index)
-                {
-                    _gameObjects.Add(gameObject);
-                    _wrappers.Add(wrapper);
-                }
-                else
-                {
-                    _gameObjects[index] = gameObject;
-                    _wrappers[index] = wrapper;
-                }
+                _gameObjects.Add(gameObject);
+                _wrappers.Add(wrapper);
+                _items.Add(item.target);
+            }
+            GObject gObject = item.target.GetChild("holder");
+            if (gObject != null)
+            {
+                gObject.visible = isLock && canActive;
             }
 
             ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].consumeArr[0], false, "#FFFBF4");

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -41,6 +41,7 @@ namespace GFGGame
             _ui.m_btnShop.target.onClick.Add(OnBtnShopClick);
             _ui.m_btnParty.target.onClick.Add(OnBtnPartyClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
+            _ui.m_comHead.onClick.Add(OnShowOhterInfo);
         }
         protected override void AddEventListener()
         {
@@ -94,6 +95,13 @@ namespace GFGGame
         {
             ViewManager.Show<LeagueChangeNoticeView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
+        private async void OnShowOhterInfo()
+        {
+            long roleId = LeagueDataManager.Instance.LeagueData.OwnerId;
+            OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(roleId);
+            OtherRoleInfoDetailData detailData = await RoleInfoSProxy.ReqOtherRoleDetailInfo(roleId);
+            ViewManager.Show<OtherRoleInfoView>(new object[] { roleInfoData, detailData }, new object[] { typeof(LeagueView).FullName, null });
+        }
         private void OnBtnChatClick()
         {
             ViewManager.Show<LeagueChatView>();

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

@@ -211,7 +211,7 @@ namespace GFGGame
                  bool result = await LuckyBoxSProxy.ReqGetBonus(_luckyBoxCfg.id, LuckyBoxDataManager.ONCE_TIME);
                  if (result)
                  {
-                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
+                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId });
                      //  LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                  }
              });
@@ -232,7 +232,7 @@ namespace GFGGame
                 bool result = await LuckyBoxSProxy.ReqGetBonus(this._luckyBoxCfg.id, LuckyBoxDataManager.TEN_TIME);
                 if (result)
                 {
-                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
+                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId });
                     // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                 }
             });

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

@@ -43,6 +43,9 @@ namespace GFGGame
         private bool showGuide = false;
         public override void Dispose()
         {
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -79,9 +82,7 @@ namespace GFGGame
             {
                 SceneController.DestroyObjectFromView(lineObj[i], lineWrapper[i]);
             }
-            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
-            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
-            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+
             notClickComStars.Clear();
             clickComStars.Clear();
             dicGameobj.Clear();

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

@@ -947,14 +947,20 @@ namespace GFGGame
             {
                 item.m_loaRes.onClick.Add(OnBtnAdJump);
             }
-            item.m_loaRes.data = _adIds[index].jumpId;
+            item.m_loaRes.data = _adIds[index];
 
             UI_ListAdItem.ProxyEnd();
         }
         private void OnBtnAdJump(EventContext context)
         {
-            string jumpId = (context.sender as GObject).data.ToString();
-            ViewManager.Show($"GFGGame.{jumpId}");
+            GObject obj = context.sender as GObject;
+            AdCfg adCfg = obj.data as AdCfg;
+            object[] param = null;
+            if (adCfg.jumpId == nameof(LimitChargeView))
+            {
+                param = new object[] { adCfg.activityId };
+            }
+            ViewManager.Show($"GFGGame.{adCfg.jumpId}", param);
         }
         private void OnListAdScrollEnd()
         {
@@ -1025,6 +1031,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
 
             RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnCiPai.target, RedDotDataManager.Instance.GetCardRed(), "", -10, 20);
         }
 
         private void CheckGuide(object param)

GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs

@@ -88,7 +88,6 @@ namespace GFGGame
             MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege1);
 
             string iconUrl = "";
-            bool isFirstBuy = false;
             bool isGot = false;
             long endTime = 0;
             int privilegeCount = 0;
@@ -98,7 +97,6 @@ namespace GFGGame
                 case ConstStoreSubId.STORE_MONTH_GOLD_CARD:
                     iconUrl = "ui://Store/MonthCard_Icon";
                     monthCfg = MonthlyCardCfgArray.Instance.GetCfg(MonthCardType.Gold);
-                    isFirstBuy = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldFirstBuy) <= 0;
                     endTime = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
                     isGot = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldReward) > 0;
                     for (int i = 0; i < MonthlyCardPrivilegeCfgArray.Instance.dataArray.Length; i++)
@@ -116,7 +114,6 @@ namespace GFGGame
                 case ConstStoreSubId.STORE_MONTH_BLACK_CARD:
                     iconUrl = "ui://Store/MonthCard_Icon";
                     monthCfg = MonthlyCardCfgArray.Instance.GetCfg(MonthCardType.BlackGold);
-                    isFirstBuy = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldFirstBuy) <= 0;
                     endTime = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime);
                     isGot = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldReward) > 0;
                     for (int i = 0; i < MonthlyCardPrivilegeCfgArray.Instance.dataArray.Length; i++)
@@ -139,11 +136,19 @@ namespace GFGGame
             _ui.m_txtTime.visible = endTime > TimeHelper.ServerNow();
             _ui.m_loaCard.url = iconUrl;
             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(monthCfg.shopId);
-            _ui.m_btnBuy.m_txtOriginalPrice.text = shopCfg.price.ToString();
-            _ui.m_btnBuy.m_grpOriginalPrice.visible = isFirstBuy && shopCfg.oncePrice < shopCfg.price;
-            int price = isFirstBuy ? shopCfg.oncePrice : shopCfg.price;
+            if(shopCfg.onceShopId > 0)
+            {
+                //如果配置了首次购买物品，使用特殊id购买
+                if(ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.onceShopId) <= 0)
+                {
+                    shopCfg = ShopCfgArray.Instance.GetCfg(shopCfg.onceShopId);
+                }
+            }
+            _ui.m_btnBuy.m_txtOriginalPrice.text = shopCfg.originalPrice.ToString();
+            _ui.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.price < shopCfg.originalPrice;
+            int price = shopCfg.price;
             _ui.m_btnBuy.m_txtPrice.text = price.ToString();
-            _ui.m_btnBuy.target.data = monthCfg.shopId;
+            _ui.m_btnBuy.target.data = shopCfg.id;
             _ui.m_txtTips.SetVar("value", (price * 10).ToString()).FlushVars();
             _ui.m_txtTips.SetVar("day", monthCfg.limitDays.ToString()).FlushVars();
 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png.meta → GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8fbfdfb83d755254bb0147d894b2f1cc
+guid: 9ed9e3b2f9307444ea5c0d05985bbf34
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_duuftf2!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5693a3c31479518409027f70f9fae4a3
+guid: ce967f454f2c41345afd56909937744d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

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