Merge branch 'master' into yujie

* master: (25 commits)
  抽奖
  月卡单品
  月卡单品
  月卡头像
  月卡特权头像
  月卡限购特权
  活动页签显示
  补给字体颜色
  商店
  月卡套装位置
  月卡套装位置
  套装月卡位置
  换装金卡位置
  商店
  改服装店转表工具
  每日签到
  好友去掉套装显示
  卡牌稀有度显示
  升星
  黑卡单品
  ...

# Conflicts:
#	FGUIProject/assets/CommonGame/package.xml
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle000.cs.meta
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

FGUIProject/assets/Arena/components/ComDanSimpleInfo.xml

@@ -8,12 +8,9 @@
     <loader id="n12_jcej" name="n12" xy="14,144" size="237,286" url="ui://4lc5fhlbjcej1n" autoSize="true">
       <gearIcon controller="c1" pages="0" values="ui://4lc5fhlbjcej1n" default="ui://4lc5fhlbjcej1t"/>
     </loader>
-    <component id="n1_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="21,5" pivot="0.5,0.5" scale="1.5,1.5" controller="c1,1"/>
-    <loader id="n10_jcej" name="n10" xy="8,3" size="250,250" url="ui://4lc5fhlbjcej1r" autoSize="true">
-      <gearIcon controller="c1" pages="1" values="ui://4lc5fhlbjcej1s" default="ui://4lc5fhlbjcej1r"/>
-    </loader>
+    <component id="n1_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="21,5" pivot="0.5,0.5" scale="1.5,1.5" controller="c1,1,c2,3"/>
     <text id="n6_psph" name="txtName" xy="67,254" pivot="0.5,0" size="132,44" fontSize="32" color="#fef7f6" align="center" autoClearText="true" text="名字名字"/>
     <text id="n7_psph" name="txtDanTitle" xy="83,298" pivot="0.5,0" size="100,34" fontSize="24" color="#fef7f6" align="center" autoClearText="true" text="段位段位"/>
-    <text id="n8_psph" name="txtRank" xy="46,327" pivot="0.5,0" size="173,34" fontSize="24" color="#fef7f6" align="center" vars="true" autoClearText="true" text="段位排名 {rank=10000}"/>
+    <text id="n8_psph" name="txtRank" xy="50,327" pivot="0.5,0" size="165,34" fontSize="24" color="#fef7f6" align="center" vars="true" autoClearText="true" text="段位排名 {rank=10000}"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListRankItem.xml

@@ -4,16 +4,15 @@
   <displayList>
     <image id="n6_jcej" name="n6" src="jcej43" fileName="images/phbphb_pbtdi.png" xy="0,0"/>
     <image id="n16_jcej" name="n16" src="jcej46" fileName="images/phbphb_xxt.png" xy="9,283"/>
-    <component id="n5_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="3,17" scale="1.117,1.117"/>
-    <component id="n9_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="185,207"/>
-    <image id="n8_jcej" name="n8" src="jcej45" fileName="images/phbphb_txkk.png" xy="36,58"/>
+    <component id="n5_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="3,17" scale="1.117,1.117" controller="c2,4"/>
+    <component id="n9_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="185,207"/>
     <loader id="n7_jcej" name="loaRank" xy="85,21" size="88,87" url="ui://4lc5fhlbjcej3m" autoSize="true">
       <gearIcon controller="c1" pages="2,3" values="ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default="ui://4lc5fhlbjcej3m"/>
     </loader>
     <component id="n10_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="173,64" scale="0.9,0.9"/>
     <loader id="n12_jcej" name="loaDanIcon" xy="94,358" size="69,65" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,42" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
-    <text id="n13_jcej" name="txtDanRank" xy="30,323" size="137,34" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排名：1"/>
-    <text id="n14_jcej" name="txtFightScore" xy="30,288" size="206,34" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力：111111"/>
+    <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,41" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
+    <text id="n13_jcej" name="txtDanRank" xy="30,323" size="136,34" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排名：1"/>
+    <text id="n14_jcej" name="txtFightScore" xy="30,288" size="196,34" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力：111111"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -3,8 +3,7 @@
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej44" fileName="images/phbphb_phdi_1.png" xy="0,0"/>
     <text id="n12_psph" name="txtRank" xy="28,41" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
-    <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="167,-18" size="229,230" group="n35_v461" scale="0.73,0.73"/>
-    <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="188,9" group="n35_v461"/>
+    <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="167,-18" size="229,230" group="n35_v461" scale="0.73,0.73" controller="c2,2"/>
     <component id="n33_v461" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="272,11" group="n35_v461" scale="0.7,0.7"/>
     <component id="n34_v461" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="273,99" group="n35_v461" scale="0.9,0.9"/>
     <group id="n35_v461" name="n35" xy="167,-18" size="229,230" group="n18_psph"/>

FGUIProject/assets/Arena/components/ListRankItem4.xml

@@ -2,19 +2,18 @@
 <component size="916,165">
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej4d" fileName="images/phbphb_zjpm.png" xy="0,0"/>
-    <text id="n12_psph" name="txtRank" xy="30,54" pivot="0.5,0" size="150,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
-    <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="189,-6" size="229,230" group="n30_jcej" scale="0.73,0.73"/>
-    <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="210,21" group="n30_jcej"/>
+    <text id="n12_psph" name="txtRank" xy="39,54" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
+    <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="189,-6" size="229,230" group="n30_jcej" scale="0.73,0.73" controller="c2,1"/>
     <component id="n24_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="294,19" group="n30_jcej" scale="0.7,0.7"/>
-    <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="294,111" group="n30_jcej" scale="0.9,0.9"/>
+    <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="294,111" group="n30_jcej" scale="0.9,0.9"/>
     <group id="n30_jcej" name="n30" xy="189,-6" size="229,230" group="n18_psph"/>
-    <text id="n14_psph" name="txtName" xy="346,33" size="48,52" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
+    <text id="n14_psph" name="txtName" xy="346,33" size="54,51" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="344,84" group="n29_jcej"/>
-    <text id="n15_psph" name="txtFightScore" xy="345,91" size="205,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力：--"/>
+    <text id="n15_psph" name="txtFightScore" xy="345,91" size="209,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力：--"/>
     <group id="n29_jcej" name="n29" xy="344,33" size="236,97" group="n18_psph"/>
     <loader id="n16_psph" name="loaDanIcon" xy="617,33" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n26_jcej" name="n26" xy="742,37" size="122,42" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
-    <text id="n17_psph" name="txtDanRank" xy="777,71" pivot="0.5,0" size="52,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
+    <text id="n26_jcej" name="n26" xy="742,37" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
+    <text id="n17_psph" name="txtDanRank" xy="773,71" pivot="0.5,0" size="59,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="742,37" size="122,90" group="n18_psph"/>
     <group id="n18_psph" name="n18" xy="30,-6" size="834,230"/>
   </displayList>

FGUIProject/assets/Arena/components/ListRecordItem.xml

@@ -2,15 +2,13 @@
 <component size="898,164">
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej24" fileName="images/bpjl_bpdi.png" xy="0,0"/>
-    <loader id="n1_psph" name="loaScore" xy="36,53" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
-    <text id="n2_psph" name="txtMyScore" xy="123,54" pivot="0.5,0" size="100,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="9999"/>
-    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
+    <loader id="n1_psph" name="loaScore" xy="36,53" size="44,44" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
+    <text id="n2_psph" name="txtMyScore" xy="130,54" pivot="0.5,0" size="85,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="9999"/>
+    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,1"/>
     <component id="n4_psph" name="loaMyCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="363,44"/>
-    <text id="n11_jcej" name="n11" xy="465,60" size="36,44" fontSize="32" color="#b07c7c" text="vs"/>
+    <text id="n11_jcej" name="n11" xy="465,60" size="29,44" fontSize="32" color="#b07c7c" text="vs"/>
     <component id="n6_psph" name="loaTargetCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="527,44"/>
-    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="563,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
-    <text id="n8_psph" name="txtTargetScore" xy="765,54" pivot="0.5,0" size="76,56" fontSize="42" color="#b07c7c" autoClearText="true" text="999"/>
-    <image id="n10_jcej" name="n10" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="241,33"/>
-    <image id="n14_jcej" name="n14" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="628,33"/>
+    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="563,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,2"/>
+    <text id="n8_psph" name="txtTargetScore" xy="771,54" pivot="0.5,0" size="64,56" fontSize="42" color="#b07c7c" autoClearText="true" text="999"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListResultItem.xml

@@ -2,15 +2,13 @@
 <component size="958,166">
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej2f" fileName="images/jjsjs_di.png" xy="0,0"/>
-    <loader id="n1_psph" name="loaScore" xy="36,53" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
-    <text id="n2_psph" name="txtMyScore" xy="108,54" pivot="0.5,0" size="124,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
-    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
+    <loader id="n1_psph" name="loaScore" xy="36,53" size="44,44" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
+    <text id="n2_psph" name="txtMyScore" xy="117,54" pivot="0.5,0" size="105,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
+    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,2"/>
     <component id="n4_psph" name="loaMyCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="360,44"/>
-    <text id="n11_jcej" name="txtRound" xy="458,60" size="118,44" fontSize="32" color="#b07c7c" letterSpacing="-2" vars="true" text="Round {value=1}"/>
+    <text id="n11_jcej" name="txtRound" xy="458,60" size="108,44" fontSize="32" color="#b07c7c" letterSpacing="-2" vars="true" text="Round {value=1}"/>
     <component id="n6_psph" name="loaTargetCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="595,44"/>
-    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="627,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
-    <text id="n8_psph" name="txtTargetScore" xy="795,54" pivot="0.5,0" size="124,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
-    <image id="n10_jcej" name="n10" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="241,33"/>
-    <image id="n14_jcej" name="n14" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="692,33"/>
+    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="627,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,2"/>
+    <text id="n8_psph" name="txtTargetScore" xy="804,54" pivot="0.5,0" size="105,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListTargetItem.xml

@@ -3,15 +3,14 @@
   <displayList>
     <loader id="n45_jcej" name="loaBg" xy="0,0" size="573,196" url="ui://4lc5fhlbjcej3b" autoSize="true"/>
     <image id="n37_jcej" name="n37" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="192,85"/>
-    <component id="n31_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="106,95" pivot="0.5,0.5" anchor="true" group="n42_jcej" scale="0.725,0.725"/>
-    <image id="n40_jcej" name="n40" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="44,38" group="n42_jcej"/>
-    <component id="n43_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="124,122" group="n42_jcej"/>
+    <component id="n31_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="106,95" pivot="0.5,0.5" anchor="true" group="n42_jcej" scale="0.725,0.725" controller="c2,2"/>
+    <component id="n43_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="124,122" group="n42_jcej"/>
     <group id="n42_jcej" name="n42" xy="-9,-20" size="230,230"/>
     <text id="n32_psph" name="txtName" xy="193,30" size="148,49" fontSize="36" color="#927550" text="对手名字"/>
     <component id="n44_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="124,30" size="41,41" aspect="true"/>
     <text id="n35_psph" name="txtDanTitle" xy="193,96" size="100,34" fontSize="24" color="#9b7c56" text="段位名称"/>
-    <text id="n33_psph" name="txtRank" xy="352,96" size="191,34" fontSize="24" color="#9b7c56" text="段位排名：10000"/>
-    <text id="n34_psph" name="txtFightScore" xy="192,131" size="215,34" fontSize="24" color="#9b7c56" text="竞技场战力：10000"/>
+    <text id="n33_psph" name="txtRank" xy="352,96" size="182,34" fontSize="24" color="#9b7c56" text="段位排名：10000"/>
+    <text id="n34_psph" name="txtFightScore" xy="192,131" size="206,34" fontSize="24" color="#9b7c56" text="竞技场战力：10000"/>
     <image id="n46_u2u3" name="imgUpDan" src="u2u353" fileName="images/jjsy_jjjj.png" xy="519,15"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/package.xml

@@ -95,7 +95,7 @@
     <component id="jcej30" name="ListResultItem.xml" path="/components/"/>
     <image id="jcej31" name="dwjl_didi.png" path="/images/"/>
     <image id="jcej32" name="jzsjzs_xtxt_1.png" path="/images/"/>
-    <image id="jcej33" name="jzsjzs_txktx.png" path="/images/"/>
+    <image id="jcej33" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
     <image id="jcej34" name="jzsjzs_sxsxa.png" path="/images/"/>
     <image id="jcej35" name="jzsjzs_ssss.png" path="/images/"/>
     <image id="jcej36" name="jzsjzs_sjsjdi.png" path="/images/"/>

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -7,7 +7,7 @@
   <displayList>
     <image id="n70_lc71" name="n70" src="qkjsbm" fileName="imagesNew/dikuang_back.png" xy="0,-212" size="1080,1039" group="n115_o9gh"/>
     <image id="n97_qkjs" name="n97" src="qkjsbb" fileName="imagesNew/card_DividingLine.png" xy="38,426" size="972,8" group="n115_o9gh"/>
-    <loader id="n101_qkjs" name="loaScore" xy="55,143" size="44,94" group="n115_o9gh" url="ui://eg2y0ldpo9ghtll" autoSize="true"/>
+    <loader id="n101_qkjs" name="loaRarity" xy="55,143" size="44,94" group="n115_o9gh" url="ui://eg2y0ldpo9ghtll" autoSize="true"/>
     <text id="n27_842s" name="txtName0" xy="143,129" pivot="0.5,0" anchor="true" size="74,91" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="70" color="#915e15" autoClearText="true" text="斗"/>
     <text id="n102_qkjs" name="txtName1" xy="199,156" pivot="0.5,0" anchor="true" size="10,62" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#915e15" autoClearText="true" text=""/>
     <text id="n103_qkjs" name="txtName2" xy="195,210" pivot="0.5,0" anchor="true" size="44,54" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#915e15" autoClearText="true" text="婵"/>
@@ -57,7 +57,7 @@
       <gearDisplay controller="ctrlTab" pages="0"/>
     </group>
     <component id="n52_l2by" name="btnUpStar" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="706,6" size="374,342" group="n79_v461">
-      <Button title="升星" icon="ui://7l6lvkayqkjsb2"/>
+      <Button title="升星" icon="ui://7l6lvkayqik1tch"/>
     </component>
     <component id="n51_l2by" name="comStarCousumeGold" src="qkjstlh" fileName="components/ComCost.xml" pkg="eg2y0ldp" xy="754,278" size="289,46" group="n79_v461" controller="c1,1"/>
     <text id="n108_qkjs" name="txtTips" xy="796,279" pivot="0.5,0" size="205,46" group="n79_v461" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716660" align="center" vAlign="middle" ubb="true" autoClearText="true" text="需要达到15级"/>

FGUIProject/assets/Card/package.xml

@@ -142,6 +142,7 @@
     <component id="vek88j" name="btnMinus.xml" path="/components/"/>
     <image id="fqortln" name="cp_yeqian_bg_shang.png" path="/images/"/>
     <image id="fqortlo" name="cp_yeqian_bg_xia.png" path="/images/"/>
+    <image id="qik1tch" name="wz_shengxing.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/components/ComCostCurrencyWithHas.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="280,42">
   <displayList>
-    <text id="n2_ojlz" name="n2" xy="7,1" size="65,42" group="n12_nasr" fontSize="30" color="#ebdfcb" autoSize="none" text="消耗"/>
-    <loader id="n1_ojlz" name="loaIcon" xy="82,-9" size="60,60" group="n12_nasr" url="ui://eg2y0ldpq08x3" autoSize="true"/>
-    <text id="n11_r9ri" name="txtCount" xy="152,1" size="121,41" group="n12_nasr" fontSize="30" color="#fdeed4" vAlign="middle" ubb="true" autoClearText="true" text="999/999"/>
-    <group id="n12_nasr" name="n12" xy="7,-9" size="266,60" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+    <text id="n2_ojlz" name="n2" xy="16,1" size="65,42" group="n12_nasr" fontSize="30" color="#9f815f" autoSize="none" text="消耗"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="91,-9" size="60,60" group="n12_nasr" url="ui://eg2y0ldpq08x3" autoSize="true"/>
+    <text id="n11_r9ri" name="txtCount" xy="161,1" size="103,41" group="n12_nasr" fontSize="30" color="#9f815f" vAlign="middle" ubb="true" autoClearText="true" text="999/999"/>
+    <group id="n12_nasr" name="n12" xy="16,-9" size="248,60" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

FGUIProject/assets/CommonGame/components/ComHead.xml

@@ -4,6 +4,9 @@
     <remark page="0" value="可见"/>
     <remark page="1" value="不可见"/>
   </controller>
+  <controller name="c2" exported="true" pages="0,,1,,2,,3,,4," selected="4">
+    <remark page="0" value="默认边框"/>
+  </controller>
   <displayList>
     <image id="n43_jcej" name="n43" src="jcejtkj" fileName="images/grxx_123.png" xy="33,40" pivot="0.5,0.5" size="160,160" group="n41_r9ri">
       <relation target="" sidePair="width-width,height-height"/>
@@ -11,9 +14,20 @@
     <component id="n39_r9ri" name="comHead" src="jcejtki" fileName="components/ComHeadIcon.xml" xy="30,37" pivot="0.5,0.5" group="n41_r9ri">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <image id="n35_r9ri" name="n35" src="r9ritjs" fileName="images/grxx_zytxtx.png" xy="28,36" pivot="0.5,0.5" size="170,171" group="n41_r9ri" aspect="true">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <image id="n45_qik1" name="n45" src="r9ritjs" fileName="images/grxx_zytxtx.png" xy="28,37" pivot="0.5,0.5" size="170,170" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c2" pages="0"/>
+    </image>
+    <image id="n46_qik1" name="n46" src="qik1tm2" fileName="images/jzsjzs_txktx.png" xy="29,36" pivot="0.5,0.5" size="166,168" group="n41_r9ri">
+      <gearDisplay controller="c2" pages="1"/>
+    </image>
+    <image id="n47_qik1" name="n47" src="qik1tm3" fileName="images/jjsjs_txk_2.png" xy="30,39" size="165,165" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c2" pages="2"/>
+    </image>
+    <image id="n48_qik1" name="n48" src="qik1tm4" fileName="images/pmts_xtk_1.png" xy="29,36" size="167,167" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c2" pages="3"/>
+    </image>
+    <image id="n49_qik1" name="n49" src="qik1tm5" fileName="images/phbphb_txkk.png" xy="30,38" size="166,166" group="n41_r9ri">
+      <gearDisplay controller="c2" pages="4"/>
     </image>
     <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>

FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,992">
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0"/>
+    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <image id="n2_qik1" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
+    <text id="n4_qik1" name="txtTitle" xy="380,92" pivot="0.5,0" size="348,54" group="n5_qik1" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" text="稀有升星材料(自选)"/>
+    <image id="n3_qik1" name="n3" src="qik1tca" fileName="componentsBg/lm_dt_zsx2.png" xy="758,111" group="n5_qik1"/>
+    <group id="n5_qik1" name="n5" xy="220,92" size="668,54" advanced="true" layout="hz" colGap="30" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+  <customProperty target="txtTitle" propertyId="0"/>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -289,7 +289,6 @@
     <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/imagesExport/" exported="true"/>
     <image id="o9gh4b" name="lm_tb_tishi.png" path="/imagesNew/" exported="true"/>
     <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
-    <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
@@ -302,7 +301,7 @@
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/"/>
     <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
-    <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/"/>
+    <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/" exported="true"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
@@ -316,7 +315,15 @@
     <image id="uxxstn3" name="txz_tb_ylq.png" path="/imagesNew/" exported="true"/>
     <image id="ittstn4" name="lm_an_jujue_1.png" path="/imagesNew/" exported="true"/>
     <image id="nyhm6" name="qrhd_ylq_db.png" path="/imagesNew/" exported="true"/>
-    <image id="jttbtn5" name="db_jiajian_1.png" path="/images/"/>
+    <image id="qik1tm2" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
+    <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
+    <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
+    <image id="qik1tm5" name="phbphb_txkk.png" path="/images/"/>
+    <image id="qik1tm6" name="tanchuang_2.png" path="/componentsBg/"/>
+    <component id="qik1tcb" name="ComBg000.xml" path="/componentsBg/" exported="true"/>
+    <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
+    <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
+    <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/components/ComSupply.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="378,643" opaque="false">
+<component size="378,643">
   <controller name="c1" exported="true" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n29_qik1" name="n29" src="qik1z" fileName="images/mrbj_tb1.png" xy="-8,24" group="n27_qik1">

FGUIProject/assets/DressUp/components/ComboBoxSuit_item.xml

@@ -2,7 +2,7 @@
 <component size="322,60" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <text id="n1_q08x" name="title" xy="103,0" size="116,39" fontSize="28" color="#b79155" align="center" vAlign="middle" singleLine="true" text="我的套装">
+    <text id="n1_q08x" name="title" xy="103,0" pivot="0.5,0" size="116,39" fontSize="28" color="#b79155" align="center" vAlign="middle" singleLine="true" text="我的套装">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     <image id="n0_q08x" name="n0" src="q08xp" fileName="imagesExport/hz_tzkuang.png" pkg="eg2y0ldp" xy="21,53" color="#e1cca3">

FGUIProject/assets/Friend/FriendUI.xml

@@ -4,13 +4,10 @@
     <loader id="n21_nb1u" 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"/>
     </loader>
-    <component id="n0_jdju" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n0_jdju" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n8_z73e" name="n8" src="z73el" fileName="images/hy_dikuang_2.png" xy="705,101" group="n9_z73e"/>
-    <text id="n2_pdeo" name="txtCount" xy="744,100" pivot="0.5,0" size="238,49" group="n9_z73e" fontSize="36" color="#e4dbcf" align="center" text="好友数：10/50"/>
+    <text id="n2_pdeo" name="txtCount" xy="746,100" pivot="0.5,0" size="234,49" group="n9_z73e" fontSize="36" color="#e4dbcf" align="center" text="好友数：10/50"/>
     <group id="n9_z73e" name="grpCount" xy="705,100" size="317,51"/>
-    <image id="n17_z73e" name="n17" src="q08xs" fileName="imagesExport/hz_xzkuang.png" pkg="eg2y0ldp" xy="200,93" group="n13_z73e"/>
-    <text id="n12_z73e" name="txtName" xy="367,98" pivot="0.5,0" size="76,49" group="n13_z73e" fontSize="36" color="#fbf6e7" strokeColor="#c9a465" strokeSize="2" text="套装"/>
-    <group id="n13_z73e" name="grpName" xy="200,93" size="410,62" advanced="true"/>
     <component id="n15_z73e" name="btnInfo" src="jdju1" fileName="components/BtnModel1.xml" xy="40,1393" group="n16_z73e">
       <Button icon="ui://wez2ujnnz73et"/>
     </component>

FGUIProject/assets/RoleInfo/components/ListHeadBorderItem.xml

@@ -7,7 +7,8 @@
       <gearDisplay controller="button" pages="1"/>
     </image>
     <loader id="n6_v95q" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" aspect="true" touchable="false" url="ui://374k3dwvr9ri23" autoSize="true"/>
-    <image id="n7_v95q" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="154,45" pkg="eg2y0ldp"/>
+    <image id="n7_v95q" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="154,45"/>
+    <image id="n8_mbf1" name="imgUnGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="26,100"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/RoleInfo/components/ListHeadItem.xml

@@ -7,7 +7,8 @@
     <image id="n5_r9ri" name="n5" src="r9rik" fileName="images/grxx_txxzlx.png" xy="2,2">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="140,18" pkg="eg2y0ldp"/>
+    <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="140,18"/>
+    <image id="n8_mbf1" name="imgUnGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="11,89"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Store/StoreBlackCardRewardUI.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,992">
+  <displayList>
+    <component id="n0_qik1" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" pkg="eg2y0ldp" xy="0,0">
+      <property target="txtTitle" propertyId="0" value="黑金卡专属"/>
+    </component>
+    <image id="n6_qik1" name="n6" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="132,796"/>
+    <text id="n7_qik1" name="n7" xy="241,822" size="682,86" fontSize="32" color="#a88656" align="center" autoSize="none" text="黑金卡玩家，每月1日5点起，可免费领取黑金卡 专属单品，请注意及时领取，逾期失效。"/>
+    <list id="n14_qik1" name="list" xy="147,176" size="809,590" layout="flow_hz" lineGap="10" colGap="20" defaultItem="ui://p9mtgheoqik1tcj" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+  <customProperty target="" propertyId="0"/>
+</component>

FGUIProject/assets/Store/StoreChargeAddUpUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
-    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
+    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员积分"/>
     <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
     <list id="n58_qik1" name="list" xy="0,790" size="1080,1082" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="8" colGap="60" defaultItem="ui://p9mtgheoqik1tby" align="center">

FGUIProject/assets/Store/StoreChargeUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
-    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
+    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员积分"/>
     <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
     <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">

FGUIProject/assets/Store/StoreMonthUI.xml

@@ -6,30 +6,31 @@
     </image>
     <image id="n2_qik1" name="n2" src="hhx918" fileName="imagesNew/MonthCard_bg.png" xy="90,552"/>
     <component id="n41_qik1" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
-    <component id="n3_qik1" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="919,564" size="52,52">
+    <component id="n3_qik1" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="908,564" size="52,52">
       <Button icon="ui://p9mtgheofqortar"/>
     </component>
     <loader id="n33_qik1" name="loaCard" xy="190,612" size="592,340" url="ui://p9mtgheohhx91a" autoSize="true"/>
-    <text id="n4_qik1" name="txtTime" xy="759,570" pivot="1,0" size="143,39" fontSize="28" color="#675c50" vars="true" text="{value=29}天后到期"/>
-    <image id="n5_qik1" name="n5" src="hhx919" fileName="imagesNew/MonthCard_Devide_baseboard.png" xy="127,1004" size="826,240"/>
+    <text id="n43_qik1" name="txtTPrivilege" xy="768,566" pivot="1,0" size="131,44" fontSize="32" color="#915e15" ubb="true" vars="true" text="[color=#C53619]{value=29}[/color]项特权"/>
+    <image id="n5_qik1" name="n5" src="hhx919" fileName="imagesNew/MonthCard_Devide_baseboard.png" xy="121,1004" size="839,240"/>
     <component id="n32_qik1" name="btnBuy" src="qik1tc2" fileName="components/Button10.xml" xy="415,864"/>
     <text id="n6_qik1" name="txtTips" xy="149,954" pivot="0.5,0" size="781,36" fontSize="26" color="#8c8580" vars="true" text="购买/续费可获得{value=300}会员积分（剩余天数超过{day=300}天后无法继续续费）"/>
-    <text id="n7_qik1" name="n7" xy="296,1025" size="182,42" group="n10_qik1" fontSize="30" color="#8c8580" vars="true" text="购买立即获得"/>
+    <text id="n7_qik1" name="n7" xy="296,1025" size="182,41" group="n10_qik1" fontSize="30" color="#8c8580" vars="true" text="购买立即获得"/>
     <loader id="n11_qik1" name="loaMoney" xy="513,1026" size="40,40" group="n15_qik1" aspect="true" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n13_qik1" name="n13" xy="554,1026" size="19,42" group="n15_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
-    <text id="n14_qik1" name="txtMoneyCount" xy="572,1025" size="47,42" group="n15_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
+    <text id="n13_qik1" name="n13" xy="554,1026" size="19,41" group="n15_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
+    <text id="n14_qik1" name="txtMoneyCount" xy="572,1025" size="47,41" group="n15_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
     <group id="n15_qik1" name="n15" xy="513,1025" size="106,43" group="n10_qik1" advanced="true"/>
-    <text id="n20_qik1" name="n20" xy="654,1026" size="63,42" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="特权"/>
+    <text id="n20_qik1" name="n20" xy="654,1026" size="63,41" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="特权"/>
     <text id="n17_qik1" name="n17" xy="717,1026" size="19,41" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
     <text id="n18_qik1" name="txtPrivilegeCount" xy="736,1025" size="47,41" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
     <group id="n19_qik1" name="n19" xy="654,1025" size="129,43" group="n10_qik1" advanced="true"/>
     <group id="n10_qik1" name="n10" xy="296,1025" size="487,43" advanced="true" layout="hz" colGap="35" excludeInvisibles="true"/>
-    <text id="n21_qik1" name="n21" xy="349,1080" size="241,42" group="n30_qik1" fontSize="30" color="#8c8580" vars="true" text="金卡期间每天获得"/>
+    <text id="n21_qik1" name="n21" xy="349,1080" size="241,41" group="n30_qik1" fontSize="30" color="#8c8580" vars="true" text="金卡期间每天获得"/>
     <loader id="n22_qik1" name="loaDailyMoney" xy="625,1081" size="40,40" group="n25_qik1" aspect="true" url="ui://eg2y0ldpkztethq" fill="scale"/>
     <text id="n23_qik1" name="n23" xy="666,1081" size="19,41" group="n25_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
     <text id="n24_qik1" name="txtDailyMoneyCount" xy="684,1080" size="47,41" group="n25_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
     <group id="n25_qik1" name="n25" xy="625,1080" size="106,42" group="n30_qik1" advanced="true"/>
     <group id="n30_qik1" name="n30" xy="349,1080" size="382,42" advanced="true" layout="hz" colGap="35" excludeInvisibles="true"/>
+    <text id="n4_qik1" name="txtTime" xy="784,1190" pivot="1,0" size="143,39" fontSize="28" color="#675c50" vars="true" text="{value=29}天后到期"/>
     <component id="n31_qik1" name="btnGet" src="qik1tc1" fileName="components/Button9.xml" xy="428,1145"/>
     <image id="n34_qik1" name="n34" src="hhx91c" fileName="imagesNew/ornamental_title.png" xy="103,1281" pivot="0.5,0.5" group="n37_qik1" scale="-1,1"/>
     <text id="n35_qik1" name="txtGiftBag" xy="474,1268" pivot="0.5,0" size="132,44" group="n37_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="特权礼包"/>
@@ -49,5 +50,6 @@
     <component id="n39_qik1" name="n39" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
+    <component id="n42_qik1" name="btnBlackReward" src="qik1tcm" fileName="components/Button11.xml" xy="869,617"/>
   </displayList>
 </component>

FGUIProject/assets/Store/components/Button11.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="130,129" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_qik1" src="qik1tcc" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="130,129" fontSize="30" autoSize="none" align="center" vAlign="middle" singleLine="true">
+      <relation target="" sidePair="width,height"/>
+    </text>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/ListBlackRewardtem.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="185,182">
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+  <displayList>
+    <image id="n19_qik1" name="n19" src="qik1tcl" fileName="imagesNew/wp_baseboard1.png" xy="0,2"/>
+    <loader id="n20_qik1" name="loaIcon" xy="96,97" pivot="0.5,0.5" anchor="true" size="122,122" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <image id="n9_qik1" name="n9" src="qik1tci" fileName="imagesNew/yf_db.png" xy="103,0" group="n14_qik1"/>
+    <text id="n10_qik1" name="txtMonth" xy="101,17" pivot="0.5,0" size="84,39" group="n14_qik1" fontSize="28" color="#9a4e16" align="center" letterSpacing="-2" text="十二月"/>
+    <group id="n14_qik1" name="grpMonth" xy="101,0" size="84,79" advanced="true"/>
+    <image id="n11_qik1" name="n11" src="qik1tce" fileName="imagesNew/dydp_db.png" xy="26,135" group="n15_qik1"/>
+    <text id="n12_qik1" name="n12" xy="31,133" pivot="0.5,0" size="126,44" group="n15_qik1" fontSize="32" color="#7c4527" align="center" letterSpacing="-2" text="当月单品"/>
+    <group id="n15_qik1" name="grpName" xy="26,133" size="140,45" advanced="true"/>
+    <image id="n13_qik1" name="imgMask" src="qik1tcd" fileName="imagesNew/dikuang_SkillItem_zz.png" xy="1,1"/>
+    <image id="n16_qik1" name="imggot" src="qik1tck" fileName="imagesNew/mrqd_kbq.png" xy="-14,38"/>
+  </displayList>
+</component>

FGUIProject/assets/Store/package.xml

@@ -148,6 +148,16 @@
     <image id="qik1tc5" name="sc_tab_duihuan.png" path="/imagesNew/"/>
     <image id="qik1tc6" name="sc_tab_duihuan_xuanzhong.png" path="/imagesNew/"/>
     <image id="qik1tc7" name="sc_tab_feihualing.png" path="/imagesNew/"/>
+    <component id="qik1tc8" name="StoreBlackCardRewardUI.xml" path="/" exported="true"/>
+    <image id="qik1tcc" name="yk_hjkdp.png" path="/imagesNew/"/>
+    <image id="qik1tcd" name="dikuang_SkillItem_zz.png" path="/imagesNew/"/>
+    <image id="qik1tce" name="dydp_db.png" path="/imagesNew/"/>
+    <image id="qik1tcg" name="tb_wenhao.png" path="/imagesNew/"/>
+    <image id="qik1tci" name="yf_db.png" path="/imagesNew/"/>
+    <component id="qik1tcj" name="ListBlackRewardtem.xml" path="/components/"/>
+    <image id="qik1tck" name="mrqd_kbq.png" path="/imagesNew/"/>
+    <image id="qik1tcl" name="wp_baseboard1.png" path="/imagesNew/"/>
+    <component id="qik1tcm" name="Button11.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/Studio/StudioBuyNumUI.xml

@@ -4,9 +4,11 @@
   <displayList>
     <component id="n26_eiwu" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,574"/>
     <image id="n32_kqhd" name="n32" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
-    <text id="n30_n3xh" name="txtTitle" xy="432,30" pivot="0.5,0" size="98,64" fontSize="48" color="#9b7853" text="提示"/>
-    <text id="n29_n3xh" name="txtTips" xy="312,150" pivot="0.5,0" size="337,51" fontSize="38" color="#917961" text="请选择获取次数方式"/>
-    <text id="n31_n3xh" name="txtNum" xy="337,220" pivot="0.5,0" size="287,44" fontSize="32" color="#917961" text="(今日已兑换0/10次)"/>
+    <text id="n30_n3xh" name="txtTitle" xy="431,30" pivot="0.5,0" size="100,64" fontSize="48" color="#9b7853" text="提示"/>
+    <text id="n29_n3xh" name="txtTips" xy="299,150" pivot="0.5,0" size="363,52" fontSize="38" color="#917961" text="  以下途径可增加次数"/>
+    <text id="n31_n3xh" name="txtNum0" xy="289,220" pivot="0.5,0" size="383,44" group="n37_qik1" fontSize="32" color="#917961" text=" 1.金卡+X次，黑金卡+X次"/>
+    <text id="n36_qik1" name="txtNum1" xy="267,269" pivot="0.5,0" size="428,44" group="n37_qik1" fontSize="32" color="#917961" text="2.道具兑换(今日已兑换0/10次)"/>
+    <group id="n37_qik1" name="n37" xy="267,220" size="428,93" advanced="true" layout="vt" lineGap="5" excludeInvisibles="true"/>
     <component id="n27_n3xh" name="comCostItem" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="335,364" group="n33_f2bf"/>
     <component id="n7_hinb" name="btnExchange" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="310,420" group="n33_f2bf">
       <Button title="兑换"/>

GameClient/Assets/Editor/Excel/ExcelConfig.cs

@@ -17,11 +17,6 @@ namespace GFGEditor
         public static string excelsCacheFolderPath = excelsFolderPath + "/CacheConfig/";
 
         /// <summary>
-        /// 共享库中存放sqlite文件的的路径
-        /// </summary>
-        public const string sqliteFilePathCSShare = "Assets/Game/CSShare/Sqlite/excelConfig.sqlite";
-
-        /// <summary>
         /// 存放编辑器序列化文件的文件夹路径
         /// </summary>
         public const string configCodePath = "Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/GenCode/Item/";

GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs

@@ -28,27 +28,17 @@ namespace GFGEditor
             SQLiteHelper.Instance.OpenConnection();
             try
             {
-                string typeIndex = "";
-                int itemId;
-                int id;
-                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgArray");
-                while (reader.Read())
+                List<ShopCfg> clothingShopCfg = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.FU_ZHUANG_DIAN, ConstStoreSubId.FU_ZHUANG_DIAN);
+                for (int i = 0; i < clothingShopCfg.Count; i++)
                 {
-                    typeIndex = reader["_typeIndex"].ToString();
-                    itemId = int.Parse(reader["_itemId"].ToString());
-                    id = int.Parse(reader["_id"].ToString());
-                    int menu1 = int.Parse(reader["_menu1"].ToString());
-                    int menu2 = int.Parse(reader["_menu2"].ToString());
-                    if (menu1 != ConstStoreTabId.FU_ZHUANG_DIAN || menu2 != ConstStoreSubId.FU_ZHUANG_DIAN) continue;
-
                     int count;
-                    if (Array.IndexOf(_shopItemType, typeIndex) >= 0)
+                    if (Array.IndexOf(_shopItemType, clothingShopCfg[i].typeIndex) >= 0)
                     {
-                        count = Array.IndexOf(_shopItemType, typeIndex);
+                        count = Array.IndexOf(_shopItemType, clothingShopCfg[i].typeIndex);
                     }
                     else
                     {
-                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(clothingShopCfg[i].itemId);
                         string itemType = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).type.ToString();
 
                         if (Array.IndexOf(_shopItemType, itemType) >= 0)
@@ -60,7 +50,7 @@ namespace GFGEditor
                             count = _shopItemType.Length - 1;
                         }
                     }
-                    _typeIndexDic.Add(id, count.ToString());
+                    _typeIndexDic.Add(clothingShopCfg[i].id, count.ToString());
                 }
             }
             catch (Exception e)

GameClient/Assets/Editor/ToolsMenu.cs

@@ -14,6 +14,8 @@ namespace GFGEditor
     {
         public static bool CommitWhenRelease = true;
 
+        public static string[] resArr = new string[] { "Res", "ResIn", "Game/CSShare/Sqlite" };
+
         enum TOOL_MENU_PRIORITY
         {
             UpdateAndImportAll,
@@ -79,7 +81,7 @@ namespace GFGEditor
         {
             EditorUtility.DisplayProgressBar("进度", "正在更新至内网", 1);
             BuildDllHelper.BuildHotUpdateDll();
-            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting");
+            BuildScript.BuildCustomBundles(resArr, "BuildSetting");
             EditorUtility.ClearProgressBar();
             if (CommitWhenRelease)
             {
@@ -207,8 +209,6 @@ namespace GFGEditor
             //}
             //开始扫描表格，自动生成部分数据
             ExcelScanner.StartScan();
-            //拷贝slqlite文件至共享库
-            File.Copy(ResPathUtil.SQLITE_FILE_PATH, ExcelConfig.sqliteFilePathCSShare, true);
             AssetDatabase.Refresh();
             EditorUtility.ClearProgressBar();
             SQLiteHelper.Instance.CloseConnection();
@@ -323,7 +323,7 @@ namespace GFGEditor
         public static void BuildBundlesRes()
         {
             BuildDllHelper.BuildHotUpdateDll();
-            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting");
+            BuildScript.BuildCustomBundles(resArr, "BuildSetting");
         }
 
         //[MenuItem("XAssets/Versions/Copy To StreamingAssets")]
@@ -371,7 +371,7 @@ namespace GFGEditor
         {
             EditorUtility.DisplayProgressBar("进度", "正在发布临时版本", 1);
             BuildDllHelper.BuildHotUpdateDll();
-            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting1");
+            BuildScript.BuildCustomBundles(resArr, "BuildSetting1");
             EditorUtility.ClearProgressBar();
         }
 

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

@@ -38,15 +38,18 @@ namespace GFGGame
             long myScore = myScores[index];
             int myCardId = ArenaDataManager.Instance.DressupList[index].cardId;
             int myHeadId = ArenaDataManager.Instance.DressupList[index].headId;
+            int myHeadBorderId = ArenaDataManager.Instance.DressupList[index].borderId;
 
             long targetScore = targetScores[index];
             // ArenaTargetData targetData = ArenaDataManager.Instance.Targets[index];
             int targetCardId = targetData.FightDatas[index].cardId;
             int targetHeadId = 0;
+            int targetBorderId = 0;
             string res = "";
             if (targetData.Type == FightTargetType.PLAYER)
             {
                 targetHeadId = targetData.FightDatas[index].headId;
+                targetBorderId = targetData.FightDatas[index].borderId;
             }
             else
             {
@@ -65,10 +68,10 @@ namespace GFGGame
             item.m_loaMyCard.m_comCardmask.m_loaCard.url = cardCfg == null ? "" : ResPathUtil.GetCardSmallPath(cardCfg.res);
             ItemCfg targetCardCfg = ItemCfgArray.Instance.GetCfg(targetCardId);
             item.m_loaTargetCard.m_comCardmask.m_loaCard.url = targetCardCfg == null ? "" : ResPathUtil.GetCardSmallPath(targetCardCfg.res);
-            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, myHeadId, 0);
+            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, myHeadId, myHeadBorderId);
             if (targetHeadId > 0)
             {
-                RoleInfoManager.Instance.UpdateHead(item.m_comTargetHead, targetHeadId, 0);
+                RoleInfoManager.Instance.UpdateHead(item.m_comTargetHead, targetHeadId, targetBorderId);
             }
             else
             {

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

@@ -4,12 +4,11 @@ using ET;
 
 namespace GFGGame
 {
-    public class CustomSuitDataManager
+    public class CustomSuitDataManager : Singleton<CustomSuitDataManager>
     {
         private static int _currentIndex;
         public static int currentIndex { get; set; }
 
-
         private static Dictionary<int, CustomSuitData> _dataDic = new Dictionary<int, CustomSuitData>();
         public static void SaveSuit(int index, DressUpData dressUpData)
         {
@@ -53,13 +52,13 @@ namespace GFGGame
             return GetSuitList(currentIndex);
         }
 
-        public static void SaveCurrentSuit(int index)
+        public static void SaveCurrentSuit(int index, bool showTips = true)
         {
             if (currentIndex != index)
             {
                 currentIndex = index;
             }
-            CustomSuitSProxy.UpdateCustomSuit(index, MyDressUpHelper.dressUpObj.DressUpDataClone()).Coroutine();
+            CustomSuitSProxy.UpdateCustomSuit(index, MyDressUpHelper.dressUpObj.DressUpDataClone(), showTips).Coroutine();
         }
 
         public static void InitServerData(List<CustomSuitProto> list)
@@ -82,5 +81,53 @@ namespace GFGGame
             }
         }
 
+        public static string[] GetSuitPosItems()
+        {
+            MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege3);
+            string[] posItems = new string[GlobalCfgArray.globalCfg.freeSuitNum + privilegeCfg.value1Arr[0] + privilegeCfg.value2Arr[0]];
+            for (int i = 0; i < posItems.Length; i++)
+            {
+                if (GetPosType(i) == 0)
+                {
+                    posItems[i] = string.Format("我的套装{0}", NumberUtil.GetChiniseNumberText(i + 1));
+                }
+                else if (GetPosType(i) == MonthCardType.Gold)
+                {
+                    if (RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
+                    {
+                        posItems[i] = string.Format("我的套装{0}", NumberUtil.GetChiniseNumberText(i + 1));
+                    }
+                    else
+                    {
+                        posItems[i] = "金卡开启";
+                    }
+                }
+                else if (GetPosType(i) == MonthCardType.BlackGold)
+                {
+                    if (RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+                    {
+                        posItems[i] = string.Format("我的套装{0}", NumberUtil.GetChiniseNumberText(i + 1));
+                    }
+                    else
+                    {
+                        posItems[i] = "黑金卡开启";
+                    }
+                }
+            }
+            return posItems;
+        }
+
+
+        //获取指定位置月卡类型
+        public static int GetPosType(int pos)
+        {
+            if (pos < GlobalCfgArray.globalCfg.freeSuitNum) return 0;
+
+            MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege3);
+            if (pos < GlobalCfgArray.globalCfg.freeSuitNum + privilegeCfg.value1Arr[0]) return MonthCardType.Gold;
+            if (pos >= GlobalCfgArray.globalCfg.freeSuitNum + privilegeCfg.value1Arr[0]) return MonthCardType.BlackGold;
+
+            return 0;
+        }
     }
 }

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

@@ -10,26 +10,12 @@ namespace GFGGame
     {
         public string[] refreshType = { "永久限购", "每日限购", "每周限购", "每月限购" };
 
-        // private Dictionary<int, int> _rechargeDic = new Dictionary<int, int>();
         private Dictionary<int, int> _goodsDic = new Dictionary<int, int>();
-        // private Dictionary<int, int> _exchangeDic = new Dictionary<int, int>();
         public void Clear()
         {
-            // _rechargeDic.Clear();
             _goodsDic.Clear();
-            // _exchangeDic.Clear();
         }
-        // public void UpdateRechargeData(int rechargeId, int num)
-        // {
-        //     if (!_rechargeDic.ContainsKey(rechargeId))
-        //     {
-        //         _rechargeDic.Add(rechargeId, num);
-        //     }
-        //     else
-        //     {
-        //         _rechargeDic[rechargeId] = num;
-        //     }
-        // }
+
         public void UpdateGiftData(int giftId, int num)
         {
             if (!_goodsDic.ContainsKey(giftId))
@@ -41,17 +27,7 @@ namespace GFGGame
                 _goodsDic[giftId] = num;
             }
         }
-        // public void UpdateExchangeData(int exchangeId, int num)
-        // {
-        //     if (!_exchangeDic.ContainsKey(exchangeId))
-        //     {
-        //         _exchangeDic.Add(exchangeId, num);
-        //     }
-        //     else
-        //     {
-        //         _exchangeDic[exchangeId] = num;
-        //     }
-        // }
+
         /************************************************************************************************************/
 
         public List<ShopCfg> GetList(int storeId, int typeIndex, int scoreType)
@@ -60,10 +36,10 @@ namespace GFGGame
             switch (storeId)
             {
                 case ConstStoreId.CLOTHING_STORE_ID:
-                    shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2AndtypeIndex(ConstStoreTabId.FU_ZHUANG_DIAN, ConstStoreSubId.FU_ZHUANG_DIAN, typeIndex);
+                    shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2AndtypeIndex(ConstStoreTabId.FU_ZHUANG_DIAN, ConstStoreSubId.FU_ZHUANG_DIAN, typeIndex.ToString());
                     break;
                 case ConstStoreId.GALLERY_STORE_ID:
-                    shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2AndtypeIndex(ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY, typeIndex);
+                    shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2AndtypeIndex(ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY, typeIndex.ToString());
                     break;
             }
             SortItemListByScore(shopCfgs, scoreType);
@@ -117,15 +93,7 @@ namespace GFGGame
 
 
         /**************************************************************************************************************************/
-        // /// <summary>
-        // /// 根据充值id获取购买次数
-        // /// </summary>
-        // /// <param name="rechargeId"></param>
-        // /// <returns></returns>
-        // public int GetRechargeBuyNumById(int rechargeId)
-        // {
-        //     return !_rechargeDic.ContainsKey(rechargeId) ? 0 : _rechargeDic[rechargeId];
-        // }
+
         /// <summary>
         /// 根据商品id获取购买次数
         /// </summary>
@@ -135,33 +103,22 @@ namespace GFGGame
         {
             return !_goodsDic.ContainsKey(goodsId) ? 0 : _goodsDic[goodsId];
         }
-        // /// <summary>
-        // /// 根据充值id获取购买次数
-        // /// </summary>
-        // /// <param name="exchangeId"></param>
-        // /// <returns></returns>
-        // public int GetExchangeBuyNumById(int exchangeId)
-        // {
-        //     return !_exchangeDic.ContainsKey(exchangeId) ? 0 : _exchangeDic[exchangeId];
-        // }
-
 
-        public List<GiftBagCfg> GetGiftBagCfgs()
+        //移除未上架商品
+        public List<ShopCfg> RemoveNotOpenCfg(List<ShopCfg> shop)
         {
-            // List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>();
-
-            // List<GiftBagCfg> noneGiftBagCfgs = GetNoneGiftCfg();
-            // giftBagCfgs = giftBagCfgs.Concat(noneGiftBagCfgs).ToList<GiftBagCfg>();
-
-            // GiftBagCfg StoryLvGiftCfg = GetStoryLvGiftCfg();
-            // if (StoryLvGiftCfg != null) giftBagCfgs.Add(StoryLvGiftCfg);
-            // GiftBagCfg RoleLvGiftCfg = GetRoleLvGiftCfg();
-            // if (RoleLvGiftCfg != null) giftBagCfgs.Add(RoleLvGiftCfg);
-            // giftBagCfgs = RemoveNotOpenCfg(giftBagCfgs);
-            // SortGiftBagCfgs(giftBagCfgs);
-            // return giftBagCfgs;
-            return null;
+            List<ShopCfg> shopCfgs = new List<ShopCfg>();
+            for (int i = shop.Count - 1; i >= 0; i--)
+            {
+                if (!string.IsNullOrEmpty(shop[i].startTime) && !TimeUtil.IsBeforeCurTime(shop[i].startTime) || !string.IsNullOrEmpty(shop[i].endTime) && !TimeUtil.IsLaterCurTime(shop[i].endTime))
+                {
+                    continue;
+                }
+                shopCfgs.Add(shop[i]);
+            }
+            return shopCfgs;
         }
+        //商品排序
         public List<ShopCfg> SortShopGoodsCfgs(List<ShopCfg> shopCfgs)
         {
             shopCfgs.Sort((ShopCfg a, ShopCfg b) =>
@@ -176,6 +133,7 @@ namespace GFGGame
             });
             return shopCfgs;
         }
+        //获取商店所有消耗品id列表
         public List<int> GetShopCostIds(List<ShopCfg> shopCfgs)
         {
             List<int> costIds = new List<int>();
@@ -189,123 +147,6 @@ namespace GFGGame
             }
             return costIds;
         }
-        // public List<ShopCfg> SortGiftBagCfgs(List<ShopCfg> shopCfgs)
-        // {
-        //     shopCfgs.Sort((ShopCfg a, ShopCfg b) =>
-        //     {
-
-        //         //未售罄的＞未解锁>已售罄的
-        //         int buyTypeA = (a.maxBuyNum == 0 || a.maxBuyNum - GetGoodsBuyNumById(a.id) > 0) ? 1 : -1;
-        //         int buyTypeB = (b.maxBuyNum == 0 || b.maxBuyNum - GetGoodsBuyNumById(b.id) > 0) ? 1 : -1;
-        //         if (buyTypeA > buyTypeB) return -1;
-        //         if (buyTypeA < buyTypeB) return 1;
-
-        //         //解锁状态
-        //         int lockA = GetShopGoodsStateById(a.id) ? 1 : -1;
-        //         int lockB = GetShopGoodsStateById(b.id) ? 1 : -1;
-        //         if (lockA > lockB) return -1;
-        //         if (lockA < lockB) return 1;
-
-        //         //免费>钻石>现金>道具
-        //         if (a.costType < b.costType) return -1;
-        //         if (a.costType > b.costType) return 1;
-
-        //         //有下架时间的 > 没有下架时间的
-        //         int endTimeA = a.endTime != "" ? 1 : -1;
-        //         int endTimeB = b.endTime != "" ? 1 : -1;
-        //         if (endTimeA > endTimeB) return -1;
-        //         if (endTimeA < endTimeB) return 1;
-
-
-        //         //折扣打的>折扣小的
-        //         int disCountA = GetShopGoodsDiscount(a.id);
-        //         int disCountB = GetShopGoodsDiscount(b.id);
-        //         if (disCountA > disCountB) return -1;
-        //         if (disCountA < disCountB) return 1;
-
-        //         //价格低的>价格高的
-        //         if (a.price != b.price) return a.price - b.price;
-
-
-        //         return 0;
-        //     });
-        //     return shopCfgs;
-        // }
-        //获取商品折扣百分比
-        public int GetShopGoodsDiscount(int goodsId)
-        {
-            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(goodsId);
-            if (shopCfg.price == 0) return 0;
-            return (int)(((double)shopCfg.originalPrice / (double)shopCfg.price) * 100);
-        }
-        private List<GiftBagCfg> RemoveNotOpenCfg(List<GiftBagCfg> giftBagCfgs)
-        {
-            for (int i = giftBagCfgs.Count - 1; i >= 0; i--)
-            {
-                if (giftBagCfgs[i].startTime != "" && !TimeUtil.IsBeforeCurTime(giftBagCfgs[i].startTime) || giftBagCfgs[i].endTime != "" && !TimeUtil.IsLaterCurTime(giftBagCfgs[i].endTime))
-                {
-                    giftBagCfgs.RemoveAt(i);
-                }
-            }
-            return giftBagCfgs;
-        }
-        private List<GiftBagCfg> GetNoneGiftCfg()
-        {
-            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>(GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.NONE));
-
-            return giftBagCfgs;
-        }
-        private GiftBagCfg GetStoryLvGiftCfg()
-        {
-            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.STORY_LV);
-            if (giftBagCfgs.Count == 0) return null;
-            giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
-            {
-                if (a.storyLevelId.CompareTo(b.storyLevelId) != 0)
-                {
-                    return a.storyLevelId.CompareTo(b.storyLevelId);
-                }
-                return -1;
-            });
-            for (int i = 0; i < giftBagCfgs.Count; i++)
-            {
-                if (GetShopGoodsStateById(giftBagCfgs[i].id) && (GetGoodsBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
-            }
-            return giftBagCfgs[0];
-        }
-        private GiftBagCfg GetRoleLvGiftCfg()
-        {
-            List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.ROLE_LV);
-            if (giftBagCfgs.Count == 0) return null;
-            giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
-            {
-                if (a.lv.CompareTo(b.lv) != 0)
-                {
-                    return a.lv.CompareTo(b.lv);
-                }
-                return -1;
-            });
-            for (int i = 0; i < giftBagCfgs.Count; i++)
-            {
-                if (GetShopGoodsStateById(giftBagCfgs[i].id) && (GetGoodsBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
-            }
-            return giftBagCfgs[0];
-        }
-
-        // public List<ShopExchangeCfg> GetExchangeCfgs()
-        // {
-        //     List<ShopExchangeCfg> shopExchangeCfgs = new List<ShopExchangeCfg>(ShopExchangeCfgArray.Instance.dataArray);
-        //     shopExchangeCfgs.Sort((ShopExchangeCfg a, ShopExchangeCfg b) =>
-        //     {
-        //         //未售罄的>已售罄的
-        //         int buyTypeA = (a.maxLimit == 0 || a.maxLimit - GetExchangeBuyNumById(a.id) > 0) ? 1 : -1;
-        //         int buyTypeB = (b.maxLimit == 0 || b.maxLimit - GetExchangeBuyNumById(b.id) > 0) ? 1 : -1;
-        //         if (buyTypeA > buyTypeB) return -1;
-        //         if (buyTypeA < buyTypeB) return 1;
-        //         return 0;
-        //     });
-        //     return shopExchangeCfgs;
-        // }
         /// <summary>
         /// 根据商品Id获取商品是否已解锁
         /// /// </summary>
@@ -337,7 +178,7 @@ namespace GFGGame
                 if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
                 {
                     bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce >= 0;
-                    lockValue = isDown ? Math.Min(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
+                    lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
                 }
                 return ArenaDataManager.Instance.Grade >= lockValue;
             }
@@ -392,5 +233,121 @@ namespace GFGGame
             endTime = TimeUtil.DateTimeToTimestamp(cfg.endTime);
             return TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
         }
+
+        //获取商品折扣百分比
+        public int GetShopGoodsDiscount(int goodsId)
+        {
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(goodsId);
+            if (shopCfg.price == 0) return 0;
+            return (int)(((double)shopCfg.originalPrice / (double)shopCfg.price) * 100);
+        }
+
+
+
+
+        // public List<ShopCfg> SortGiftBagCfgs(List<ShopCfg> shopCfgs)
+        // {
+        //     shopCfgs.Sort((ShopCfg a, ShopCfg b) =>
+        //     {
+
+        //         //未售罄的＞未解锁>已售罄的
+        //         int buyTypeA = (a.maxBuyNum == 0 || a.maxBuyNum - GetGoodsBuyNumById(a.id) > 0) ? 1 : -1;
+        //         int buyTypeB = (b.maxBuyNum == 0 || b.maxBuyNum - GetGoodsBuyNumById(b.id) > 0) ? 1 : -1;
+        //         if (buyTypeA > buyTypeB) return -1;
+        //         if (buyTypeA < buyTypeB) return 1;
+
+        //         //解锁状态
+        //         int lockA = GetShopGoodsStateById(a.id) ? 1 : -1;
+        //         int lockB = GetShopGoodsStateById(b.id) ? 1 : -1;
+        //         if (lockA > lockB) return -1;
+        //         if (lockA < lockB) return 1;
+
+        //         //免费>钻石>现金>道具
+        //         if (a.costType < b.costType) return -1;
+        //         if (a.costType > b.costType) return 1;
+
+        //         //有下架时间的 > 没有下架时间的
+        //         int endTimeA = a.endTime != "" ? 1 : -1;
+        //         int endTimeB = b.endTime != "" ? 1 : -1;
+        //         if (endTimeA > endTimeB) return -1;
+        //         if (endTimeA < endTimeB) return 1;
+
+
+        //         //折扣打的>折扣小的
+        //         int disCountA = GetShopGoodsDiscount(a.id);
+        //         int disCountB = GetShopGoodsDiscount(b.id);
+        //         if (disCountA > disCountB) return -1;
+        //         if (disCountA < disCountB) return 1;
+
+        //         //价格低的>价格高的
+        //         if (a.price != b.price) return a.price - b.price;
+
+
+        //         return 0;
+        //     });
+        //     return shopCfgs;
+        // }
+
+
+        // private List<GiftBagCfg> GetNoneGiftCfg()
+        // {
+        //     List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>(GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.NONE));
+
+        //     return giftBagCfgs;
+        // }
+        // private GiftBagCfg GetStoryLvGiftCfg()
+        // {
+        //     List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.STORY_LV);
+        //     if (giftBagCfgs.Count == 0) return null;
+        //     giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
+        //     {
+        //         if (a.storyLevelId.CompareTo(b.storyLevelId) != 0)
+        //         {
+        //             return a.storyLevelId.CompareTo(b.storyLevelId);
+        //         }
+        //         return -1;
+        //     });
+        //     for (int i = 0; i < giftBagCfgs.Count; i++)
+        //     {
+        //         if (GetShopGoodsStateById(giftBagCfgs[i].id) && (GetGoodsBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
+        //     }
+        //     return giftBagCfgs[0];
+        // }
+        // private GiftBagCfg GetRoleLvGiftCfg()
+        // {
+        //     List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgsBylockType(LockType.ROLE_LV);
+        //     if (giftBagCfgs.Count == 0) return null;
+        //     giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
+        //     {
+        //         if (a.lv.CompareTo(b.lv) != 0)
+        //         {
+        //             return a.lv.CompareTo(b.lv);
+        //         }
+        //         return -1;
+        //     });
+        //     for (int i = 0; i < giftBagCfgs.Count; i++)
+        //     {
+        //         if (GetShopGoodsStateById(giftBagCfgs[i].id) && (GetGoodsBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
+        //     }
+        //     return giftBagCfgs[0];
+        // }
+
+        // public List<ShopExchangeCfg> GetExchangeCfgs()
+        // {
+        //     List<ShopExchangeCfg> shopExchangeCfgs = new List<ShopExchangeCfg>(ShopExchangeCfgArray.Instance.dataArray);
+        //     shopExchangeCfgs.Sort((ShopExchangeCfg a, ShopExchangeCfg b) =>
+        //     {
+        //         //未售罄的>已售罄的
+        //         int buyTypeA = (a.maxLimit == 0 || a.maxLimit - GetExchangeBuyNumById(a.id) > 0) ? 1 : -1;
+        //         int buyTypeB = (b.maxLimit == 0 || b.maxLimit - GetExchangeBuyNumById(b.id) > 0) ? 1 : -1;
+        //         if (buyTypeA > buyTypeB) return -1;
+        //         if (buyTypeA < buyTypeB) return 1;
+        //         return 0;
+        //     });
+        //     return shopExchangeCfgs;
+        // }
+
+
+
     }
 }

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

@@ -126,15 +126,6 @@ namespace GFGGame
                 return;
             }
 
-            // if (cfg.costType == CostType.RMB)
-            // {
-            //     if (!AntiAddictionController.CheckAntiAddictionRecharge(cfg.price))
-            //     {
-            //         ShopSProxy.ReqShopBuy(cfg.id, 1).Coroutine();
-            //         LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
-            //     }
-            // }
-            // else 
             if (cfg.costType == CostType.FREE)
             {
                 ShopSProxy.ReqShopBuy(cfg.id, 1).Coroutine();

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

@@ -18,6 +18,7 @@ namespace GFGGame
         /**********************************************玩家独立数据*****************************************/
 
         public int headId;//头像id
+        public int borderId;//头像框id
         public Dictionary<int, List<int>> pardListDic = new Dictionary<int, List<int>>();//战斗部位，部件列表,战斗开始时更新
         public Dictionary<int, List<int>> pardScoreListDic = new Dictionary<int, List<int>>();//战斗部位，部件分数列表,战斗开始时更新
         public List<int> itemList = new List<int>();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -11,7 +11,7 @@ namespace UI.Card
         public Controller m_ctrlFullLv;
         public Controller m_ctrlTab;
         public Controller m_ctrlSkillCount;
-        public GLoader m_loaScore;
+        public GLoader m_loaRarity;
         public GTextField m_txtName0;
         public GTextField m_txtName1;
         public GTextField m_txtName2;
@@ -97,7 +97,7 @@ namespace UI.Card
             m_ctrlFullLv = comp.GetController("ctrlFullLv");
             m_ctrlTab = comp.GetController("ctrlTab");
             m_ctrlSkillCount = comp.GetController("ctrlSkillCount");
-            m_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtName0 = (GTextField)comp.GetChild("txtName0");
             m_txtName1 = (GTextField)comp.GetChild("txtName1");
             m_txtName2 = (GTextField)comp.GetChild("txtName2");
@@ -139,7 +139,7 @@ namespace UI.Card
             m_ctrlFullLv = null;
             m_ctrlTab = null;
             m_ctrlSkillCount = null;
-            m_loaScore = null;
+            m_loaRarity = null;
             m_txtName0 = null;
             m_txtName1 = null;
             m_txtName2 = null;

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c9694e90c44334e88a8a5acfdcbf2ebd
+guid: 6ce679f271e4dc547b0eac4164060878
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComBg000
+    {
+        public GComponent target;
+        public GButton m_btnClose;
+        public GTextField m_txtTitle;
+        public const string URL = "ui://eg2y0ldpqik1tcb";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComBg000";
+        private static UI_ComBg000 _proxy;
+
+        public static UI_ComBg000 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComBg000();
+            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_ComBg000 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComBg000();
+            }
+            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_btnClose = (GButton)comp.GetChild("btnClose");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnClose = null;
+            m_txtTitle = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -8,6 +8,7 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public UI_ComHeadIcon m_comHead;
         public GLoader m_loaBorder;
         public const string URL = "ui://eg2y0ldpr9ri1h";
@@ -58,12 +59,14 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_comHead.Dispose();
             m_comHead = null;
             m_loaBorder = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs

@@ -10,8 +10,6 @@ namespace UI.Friend
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GTextField m_txtCount;
-        public GTextField m_txtName;
-        public GGroup m_grpName;
         public GButton m_btnInfo;
         public GButton m_btnDelete;
         public GButton m_btnAdd;
@@ -67,8 +65,6 @@ namespace UI.Friend
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_grpName = (GGroup)comp.GetChild("grpName");
             m_btnInfo = (GButton)comp.GetChild("btnInfo");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
@@ -80,8 +76,6 @@ namespace UI.Friend
             m_loaBg = null;
             m_btnBack = null;
             m_txtCount = null;
-            m_txtName = null;
-            m_grpName = null;
             m_btnInfo = null;
             m_btnDelete = null;
             m_btnAdd = null;

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

@@ -10,6 +10,7 @@ namespace UI.RoleInfo
         public GLoader m_loaIcon;
         public GLoader m_loaBorder;
         public GImage m_imgNew;
+        public GImage m_imgUnGet;
         public const string URL = "ui://374k3dwvv95qg3";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListHeadBorderItem";
@@ -60,12 +61,14 @@ namespace UI.RoleInfo
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_imgNew = (GImage)comp.GetChild("imgNew");
+            m_imgUnGet = (GImage)comp.GetChild("imgUnGet");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
             m_loaBorder = null;
             m_imgNew = null;
+            m_imgUnGet = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,6 +9,7 @@ namespace UI.RoleInfo
         public GButton target;
         public GLoader m_loaIcon;
         public GImage m_imgNew;
+        public GImage m_imgUnGet;
         public const string URL = "ui://374k3dwvr9ri9";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListHeadItem";
@@ -58,11 +59,13 @@ namespace UI.RoleInfo
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_imgNew = (GImage)comp.GetChild("imgNew");
+            m_imgUnGet = (GImage)comp.GetChild("imgUnGet");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
             m_imgNew = null;
+            m_imgUnGet = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListBlackRewardtem.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ListBlackRewardtem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaIcon;
+        public GTextField m_txtMonth;
+        public GGroup m_grpMonth;
+        public GGroup m_grpName;
+        public GImage m_imgMask;
+        public GImage m_imggot;
+        public const string URL = "ui://p9mtgheoqik1tcj";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ListBlackRewardtem";
+        private static UI_ListBlackRewardtem _proxy;
+
+        public static UI_ListBlackRewardtem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListBlackRewardtem();
+            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_ListBlackRewardtem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListBlackRewardtem();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtMonth = (GTextField)comp.GetChild("txtMonth");
+            m_grpMonth = (GGroup)comp.GetChild("grpMonth");
+            m_grpName = (GGroup)comp.GetChild("grpName");
+            m_imgMask = (GImage)comp.GetChild("imgMask");
+            m_imggot = (GImage)comp.GetChild("imggot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaIcon = null;
+            m_txtMonth = null;
+            m_grpMonth = null;
+            m_grpName = null;
+            m_imgMask = null;
+            m_imggot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListBlackRewardtem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreBlackCardRewardUI.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreBlackCardRewardUI
+    {
+        public GComponent target;
+        public GComponent m_comBg;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheoqik1tc8";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreBlackCardRewardUI";
+        private static UI_StoreBlackCardRewardUI _proxy;
+
+        public static UI_StoreBlackCardRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreBlackCardRewardUI();
+            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_StoreBlackCardRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreBlackCardRewardUI();
+            }
+            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_comBg = (GComponent)comp.GetChild("comBg");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comBg = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreBlackCardRewardUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthUI.cs

@@ -10,7 +10,7 @@ namespace UI.Store
         public GComponent m_valueBar;
         public GButton m_btnRule;
         public GLoader m_loaCard;
-        public GTextField m_txtTime;
+        public GTextField m_txtTPrivilege;
         public UI_Button10 m_btnBuy;
         public GTextField m_txtTips;
         public GLoader m_loaMoney;
@@ -18,9 +18,11 @@ namespace UI.Store
         public GTextField m_txtPrivilegeCount;
         public GLoader m_loaDailyMoney;
         public GTextField m_txtDailyMoneyCount;
+        public GTextField m_txtTime;
         public GButton m_btnGet;
         public GTextField m_txtGiftBag;
         public GList m_list;
+        public GButton m_btnBlackReward;
         public const string URL = "ui://p9mtgheoqik1tc0";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreMonthUI";
@@ -71,7 +73,7 @@ namespace UI.Store
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_loaCard = (GLoader)comp.GetChild("loaCard");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_txtTPrivilege = (GTextField)comp.GetChild("txtTPrivilege");
             m_btnBuy = (UI_Button10)UI_Button10.Create(comp.GetChild("btnBuy"));
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_loaMoney = (GLoader)comp.GetChild("loaMoney");
@@ -79,16 +81,18 @@ namespace UI.Store
             m_txtPrivilegeCount = (GTextField)comp.GetChild("txtPrivilegeCount");
             m_loaDailyMoney = (GLoader)comp.GetChild("loaDailyMoney");
             m_txtDailyMoneyCount = (GTextField)comp.GetChild("txtDailyMoneyCount");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
             m_list = (GList)comp.GetChild("list");
+            m_btnBlackReward = (GButton)comp.GetChild("btnBlackReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_valueBar = null;
             m_btnRule = null;
             m_loaCard = null;
-            m_txtTime = null;
+            m_txtTPrivilege = null;
             m_btnBuy.Dispose();
             m_btnBuy = null;
             m_txtTips = null;
@@ -97,9 +101,11 @@ namespace UI.Store
             m_txtPrivilegeCount = null;
             m_loaDailyMoney = null;
             m_txtDailyMoneyCount = null;
+            m_txtTime = null;
             m_btnGet = null;
             m_txtGiftBag = null;
             m_list = null;
+            m_btnBlackReward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioBuyNumUI.cs

@@ -11,7 +11,8 @@ namespace UI.Studio
         public GComponent m_loaBg;
         public GTextField m_txtTitle;
         public GTextField m_txtTips;
-        public GTextField m_txtNum;
+        public GTextField m_txtNum0;
+        public GTextField m_txtNum1;
         public GComponent m_comCostItem;
         public GButton m_btnExchange;
         public GComponent m_comCostCurrent;
@@ -67,7 +68,8 @@ namespace UI.Studio
             m_loaBg = (GComponent)comp.GetChild("loaBg");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtNum0 = (GTextField)comp.GetChild("txtNum0");
+            m_txtNum1 = (GTextField)comp.GetChild("txtNum1");
             m_comCostItem = (GComponent)comp.GetChild("comCostItem");
             m_btnExchange = (GButton)comp.GetChild("btnExchange");
             m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
@@ -79,7 +81,8 @@ namespace UI.Studio
             m_loaBg = null;
             m_txtTitle = null;
             m_txtTips = null;
-            m_txtNum = null;
+            m_txtNum0 = null;
+            m_txtNum1 = null;
             m_comCostItem = null;
             m_btnExchange = null;
             m_comCostCurrent = null;

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

@@ -203,6 +203,7 @@ namespace GFGGame
                     ArenaDataManager.Instance.LastRank = ArenaDataManager.Instance.Rank;
                     ArenaDataManager.Instance.LastTargetInfo.roleName = targetData.RoleInfo.roleName;
                     ArenaDataManager.Instance.LastTargetInfo.headId = targetData.RoleInfo.headId;
+                    ArenaDataManager.Instance.LastTargetInfo.headBorderId = targetData.RoleInfo.headBorderId;
                     ArenaDataManager.Instance.LastTargetInfo.headRes = targetData.RoleInfo.headRes;
                     ArenaDataManager.Instance.BonusList = ItemUtil.CreateItemDataList(response.rewards);
                     ArenaDataManager.Instance.LastTargets = new List<ArenaTargetData>(ArenaDataManager.Instance.Targets);

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

@@ -9,7 +9,7 @@ namespace GFGGame
 {
     public class CustomSuitSProxy
     {
-        public static async ETTask UpdateCustomSuit(int index, DressUpData dressUpData)
+        public static async ETTask UpdateCustomSuit(int index, DressUpData dressUpData, bool showTipe = true)
         {
             CustomSuitProto suitProto = new CustomSuitProto();
             suitProto.Pos = index;
@@ -29,7 +29,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     CustomSuitDataManager.SaveSuit(index, dressUpData);
-                    PromptController.Instance.ShowFloatTextPrompt("保存成功", MessageType.SUCCESS);
+                    if (showTipe) PromptController.Instance.ShowFloatTextPrompt("保存成功", MessageType.SUCCESS);
 
                 }
             }

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

@@ -27,6 +27,10 @@ namespace GFGGame
                     //自定义套装
                     CustomSuitDataManager.InitServerData(response.CustomSuits);
                     CustomSuitDataManager.currentIndex = response.CustomSuitPos;
+                    if (!RoleDataManager.CheckIsMonthCardOpenByType(CustomSuitDataManager.GetPosType(CustomSuitDataManager.currentIndex)))
+                    {
+                        CustomSuitDataManager.currentIndex = 0;
+                    }
                     for (int i = 0; i < response.NewItems.Count; i++)
                     {
                         ItemCfg cfg = ItemCfgArray.Instance.GetCfg(response.NewItems[i]);
@@ -96,7 +100,7 @@ namespace GFGGame
         {
             M2C_GiftBoxSelConsumption response = null;
             response = (M2C_GiftBoxSelConsumption)await MessageHelper.SendToServer(new C2M_GiftBoxSelConsumption()
-                { ItemId = itemID, GiftBoxSelChildItems = giftBoxSelChildItems });
+            { ItemId = itemID, GiftBoxSelChildItems = giftBoxSelChildItems });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

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

@@ -22,5 +22,19 @@ namespace GFGGame
             }
             return false;
         }
+        //请求轮换抽奖活动信息
+        public static async ETTask<int> ReqGetLuckyBoxRotatingInfo()
+        {
+            S2C_GetLuckyBoxRotatingInfo response = null;
+            response = (S2C_GetLuckyBoxRotatingInfo)await MessageHelper.SendToServer(new C2S_GetLuckyBoxRotatingInfo() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return response.RotatingId;
+                }
+            }
+            return 0;
+        }
     }
 }

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

@@ -8,7 +8,7 @@ namespace GFGGame
         public static readonly string UI_DIR_PATH = "Assets/ResIn/UI";
         public static readonly string PREFAB_DIR_PATH = "Assets/ResIn/Prefab";
         public static readonly string TEXTURE_FIGHT_DIR_PATH = "Assets/ResIn/Fight";
-        public static readonly string CONFIG_DIR_PATH = "Assets/ResIn/Config";
+        public static readonly string CONFIG_DIR_PATH = "Assets/Game/CSShare/Sqlite";
 
 
         public const string RES_ROOT_DIR_PATH = "Assets/Res";

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

@@ -45,8 +45,8 @@ namespace GFGGame
 
             this.clickBlankToClose = false;
 
-            UpdateInfo(_ui.m_comMyHeadInfo.target, ArenaDataManager.Instance.Grade, ArenaDataManager.Instance.Rank, RoleDataManager.roleName, RoleDataManager.headId, "");
-            UpdateInfo(_ui.m_comTargetHeadInfo.target, lastGrade, lastRank, targetName, targetHeadId, targetHeadRes);
+            UpdateInfo(_ui.m_comMyHeadInfo.target, ArenaDataManager.Instance.Grade, ArenaDataManager.Instance.Rank, RoleDataManager.roleName, RoleDataManager.headId, RoleDataManager.headBorderId, "");
+            UpdateInfo(_ui.m_comTargetHeadInfo.target, lastGrade, lastRank, targetName, targetHeadId, 0, targetHeadRes);
 
             _ui.m_t0.Play(() => { this.clickBlankToClose = true; });
         }
@@ -62,7 +62,7 @@ namespace GFGGame
             base.RemoveEventListener();
         }
 
-        private void UpdateInfo(GComponent com, int grade, int rank, string name, int headId, string res)
+        private void UpdateInfo(GComponent com, int grade, int rank, string name, int headId, int borderId, string res)
         {
             UI_ComDanSimpleInfo comDanSimpleInfo = UI_ComDanSimpleInfo.Proxy(com);
             comDanSimpleInfo.m_txtName.text = name;
@@ -71,7 +71,7 @@ namespace GFGGame
             comDanSimpleInfo.m_txtRank.text = string.Format("段位排名：{0}", rank);
             if (headId > 0)
             {
-                RoleInfoManager.Instance.UpdateHead(comDanSimpleInfo.m_comHead, headId, 0);
+                RoleInfoManager.Instance.UpdateHead(comDanSimpleInfo.m_comHead, headId, borderId);
             }
             else
             {

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

@@ -243,7 +243,7 @@ namespace GFGGame
                 {
                     //上榜的玩家一定战斗过，可以直接计算
                     item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
-                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
+                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else
                 {
@@ -257,7 +257,7 @@ namespace GFGGame
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
-                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
+                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else
                 {
@@ -302,7 +302,7 @@ namespace GFGGame
                 {
                     //上榜的玩家一定战斗过，可以直接计算
                     item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
-                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
+                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else
                 {

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

@@ -49,7 +49,7 @@ namespace GFGGame
             _ui.m_txtDantitle.text = rankCfg.gradeName;
             if (_targetData.Type == FightTargetType.PLAYER)
             {
-                RoleInfoManager.Instance.UpdateHead(_ui.m_comTargetHead, _targetData.RoleInfo.headId, 0);
+                RoleInfoManager.Instance.UpdateHead(_ui.m_comTargetHead, _targetData.RoleInfo.headId, _targetData.RoleInfo.headBorderId);
             }
             else
             {

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

@@ -391,7 +391,7 @@ namespace GFGGame
 
             if (targetData.Type == FightTargetType.PLAYER)
             {
-                RoleInfoManager.Instance.UpdateHead(item.m_comHead, targetData.RoleInfo.headId, 0);
+                RoleInfoManager.Instance.UpdateHead(item.m_comHead, targetData.RoleInfo.headId, targetData.RoleInfo.headBorderId);
             }
             else
             {

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

@@ -169,12 +169,16 @@ namespace GFGGame
         private void UpdateNormal()
         {
             _ui.m_ComFosterTop.m_btnStory.visible = CardDataManager.GetStoryCfgsById(_cardData.id).Count > 0 ? true : false;
-            // _comFosterBottom.m_btnUpLv.grayed = true;
-            // _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = false;
             _valueBarController = new ValueBarController(_ui.m_ComFosterTop.m_comValueBar, 5);
             _valueBarController.OnShown();
+            RarityIconController.UpdateRarityIcon(_ui.m_ComFosterBottom.m_loaRarity, _cardData.id, false);
 
             string names = _cardData.itemCfg.name;
+            _comFosterBottom.m_txtName0.text = "";
+            _comFosterBottom.m_txtName1.text = "";
+            _comFosterBottom.m_txtName2.text = "";
+            _comFosterBottom.m_txtName3.text = "";
+            _comFosterBottom.m_txtName4.text = "";
             switch (names.Length)
             {
                 case 1:

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -133,7 +133,7 @@ namespace GFGGame
                     {
                         if (dataArray[i].itemId == _selectedItemId)
                         {
-                            _selectedType = dataArray[i].typeIndex;
+                            _selectedType = int.Parse(dataArray[i].typeIndex);
                             _selectedId = dataArray[i].id;
                             // ShopCfg clothingShopCfg = ShopCfgClothingArray.Instance.GetCfg(_selectedItemClothingId);
                             _ui.m_listType.selectedIndex = _selectedType;

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs

@@ -116,7 +116,7 @@ namespace GFGGame
                     {
                         if (dataArray[i].itemId == _selectedItemId)
                         {
-                            _selectedType = dataArray[i].typeIndex;
+                            _selectedType = int.Parse(dataArray[i].typeIndex);
                             _selectedId = dataArray[i].id;
                             _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex = _selectedType;
                             break;

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

@@ -50,32 +50,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
-            if (TimeHelper.ClientNow() < TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.refreshTime))
-            {
-                if (DateTime.Now.Day == 1)
-                {
-                    if (DateTime.Now.Month == 1)
-                    {
-                        _month = 12;
-                    }
-                    else
-                    {
-                        _month = DateTime.Now.Month - 1;
-                    }
-                    List<DailySignBonusCfg> cfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
-                    _day = cfgs[cfgs.Count - 1].day;
-                }
-                else
-                {
-                    _day = DateTime.Now.Day - 1;
-                }
-            }
-            else
-            {
-                _month = DateTime.Now.Month;
-                _day = DateTime.Now.Day;
-            }
+            _month = TimeUtil.GetCurMonth();
+            _day = TimeUtil.GetCurDay();
             _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
             UpdateSignView();
         }
@@ -180,6 +156,12 @@ namespace GFGGame
             int day = (int)obj.data;
             bool result = false;
             if (day > _day) return;
+            bool isGot = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay), day);
+            if (isGot)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("已领取");
+                return;
+            }
             if (day < _day)
             {
                 int[] cost = GlobalCfgArray.globalCfg.dailySignConsumeArr[0];

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

@@ -1,6 +1,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using ET;
 using FairyGUI;
 using UI.DailyWelfare;
@@ -39,8 +40,9 @@ namespace GFGGame
             packageName = UI_DailySupplyUI.PACKAGE_NAME;
             _ui = UI_DailySupplyUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
-
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             // _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             // _ui.m_btnback.onClick.Add(OnBtnBackClick);
@@ -49,43 +51,15 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateSupplyView);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("mrqd_bjbj");
-
-            // _valueBarController.OnShown();
-
-            if (TimeHelper.ClientNow() < TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.refreshTime))
-            {
-                if (DateTime.Now.Day == 1)
-                {
-                    if (DateTime.Now.Month == 1)
-                    {
-                        _month = 12;
-                    }
-                    else
-                    {
-                        _month = DateTime.Now.Month - 1;
-                    }
-                    List<DailySignBonusCfg> cfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
-                    _day = cfgs[cfgs.Count - 1].day;
-                }
-                else
-                {
-                    _day = DateTime.Now.Day - 1;
-                }
-            }
-            else
-            {
-                _month = DateTime.Now.Month;
-                _day = DateTime.Now.Day;
-            }
-            // _ui.m_list.ScrollToView(0);
-            UpdateView();
+            _month = TimeUtil.GetCurMonth();
+            _day = TimeUtil.GetCurDay();
+            UpdateSupplyView();
         }
 
         protected override void OnHide()
@@ -96,7 +70,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateSupplyView);
         }
 
         private void OnBtnBackClick()
@@ -125,14 +99,8 @@ namespace GFGGame
             long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
             item.m_txtTime.text = TimeUtil.FormattingTime6(openTime) + "-" + TimeUtil.FormattingTime6(endTime);
             item.m_txtCount.text = supplyCfg.bonusArr[0][1].ToString();
-            // if (item.m_comItem.data == null)
-            // {
-            //     item.m_comItem.data = new ItemView(item.m_comItem);
-            // }
-            // ItemData itemData = ItemUtil.createItemData(supplyCfg.bonusArr[0]);
-            // (item.m_comItem.data as ItemView).SetData(itemData);
-            // (item.m_comItem.data as ItemView).ShowTips = false;
-            ItemUtil.UpdateItemNeedNum(item.m_comCost, GlobalCfgArray.globalCfg.dailySupplyConsumeArr[0]);
+
+            ItemUtil.UpdateItemNeedNum(item.m_comCost, GlobalCfgArray.globalCfg.dailySupplyConsumeArr[0], false, "#FFF6ED");
             item.m_comCost.visible = false;
 
             if (MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.DailySupplyReward), supplyCfg.id))
@@ -143,7 +111,7 @@ namespace GFGGame
             }
 
             long curTime = TimeHelper.ServerNow();
-            if (curTime < openTime)
+            if (curTime < openTime && curTime > TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.refreshTime))
             {
                 item.m_btnGet.title = "领取";
                 item.m_btnGet.enabled = false;
@@ -166,13 +134,35 @@ namespace GFGGame
             item.m_btnGet.data = supplyCfg;
             UI_ComSupply.ProxyEnd();
         }
-        private async void OnBtnGetSupplyClick(EventContext context)
+        private void OnBtnGetSupplyClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
             DailySupplyCfg supplyCfg = obj.data as DailySupplyCfg;
             long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
             long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
-            bool result = await DailyWelfareSProxy.ReqGetSupplyReward(supplyCfg.id);
+            if (TimeHelper.ServerNow() > endTime)
+            {
+                int[] cost = GlobalCfgArray.globalCfg.dailySupplyConsumeArr[0];
+                AlertUI.Show(string.Format("是否确定花费{0}{1}补领？", cost[1], ItemCfgArray.Instance.GetCfg(cost[0]).name)).
+                  SetLeftButton(true, "否").
+                  SetRightButton(true, "是", (object param) =>
+                   {
+                       if (ItemDataManager.GetItemNum(cost[0]) < cost[1])
+                       {
+                           PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                           return;
+                       }
+                       ReqSupplyAsync(supplyCfg.id);
+                   });
+            }
+            else
+            {
+                ReqSupplyAsync(supplyCfg.id);
+            }
+        }
+        private async void ReqSupplyAsync(int id)
+        {
+            bool result = await DailyWelfareSProxy.ReqGetSupplyReward(id);
             if (result)
             {
                 UpdateSupplyView();

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

@@ -33,7 +33,7 @@ namespace GFGGame
         private int _rarityIndex = SORT_BY_HIGH_RARITY;
         private UI_TypeItem listTypeItem_FreedomDress;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
-
+        private int currentIndex = 0;
         private int _stepIndex = -1;
         private List<CustomSuitData> _dressMemory = new List<CustomSuitData>();
         public override void Dispose()
@@ -74,8 +74,10 @@ namespace GFGGame
             _ui.m_btnSearch.visible = true;
             _ui.m_btnPhoto.visible = true;
             _ui.m_btnAction.visible = false;
-            _ui.m_comboBox.items = new string[] { "我的套装一", "我的套装二", "我的套装三", "我的套装四", "我的套装五", "我的套装六" };
+
+            // _ui.m_comboBox.items = new string[] { "我的套装一", "我的套装二", "我的套装三", "我的套装四", "我的套装五", "我的套装六" };
             _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高稀有度", "低稀有度", "最近获得" };
+
             InitLists();
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
@@ -133,10 +135,11 @@ namespace GFGGame
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
-            _ui.m_comboBox.selectedIndex = CustomSuitDataManager.currentIndex;
-            MyDressUpHelper.PutOnSuitSavedByPos(CustomSuitDataManager.currentIndex);
-            // UpdateStepBtn();
-            // AddMemoryDressup();
+
+            currentIndex = CustomSuitDataManager.currentIndex;
+            _ui.m_comboBox.items = CustomSuitDataManager.GetSuitPosItems();
+            _ui.m_comboBox.selectedIndex = currentIndex;
+            MyDressUpHelper.PutOnSuitSavedByPos(currentIndex);
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -201,6 +204,20 @@ namespace GFGGame
         }
         private void OnComboBoxChanged()
         {
+            if (_ui.m_comboBox.selectedIndex == currentIndex) return;
+            if (CustomSuitDataManager.GetPosType(_ui.m_comboBox.selectedIndex) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
+            {
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GLOAD_CARD });
+                _ui.m_comboBox.selectedIndex = currentIndex;
+                return;
+            }
+            if (CustomSuitDataManager.GetPosType(_ui.m_comboBox.selectedIndex) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+            {
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_BLACK_CARD });
+                _ui.m_comboBox.selectedIndex = currentIndex;
+                return;
+            }
+            currentIndex = _ui.m_comboBox.selectedIndex;
             MyDressUpHelper.PutOnSuitSavedByPos(_ui.m_comboBox.selectedIndex);
         }
 

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -274,18 +274,13 @@ namespace GFGGame
         }
         private void UpdateScene(CustomSuitData suitSavedData)
         {
-
             if (suitSavedData != null)
             {
                 _dressUpObj.PutOnDressUpData(suitSavedData.dressUpData);
-                _ui.m_txtName.text = string.Format("我的套装{0}", NumberUtil.GetChiniseNumberText(suitSavedData.pos + 1));
-
             }
             else
             {
                 _dressUpObj.PutOnDefaultDressUpData();
-                _ui.m_txtName.text = string.Format("我的套装{0}", NumberUtil.GetChiniseNumberText(1));
-
             }
         }
 

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

@@ -96,7 +96,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnListBgScroll);
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, OnListBgScroll);
         }
-        protected override void OnShown()
+        protected override async void OnShown()
         {
             base.OnShown();
 
@@ -116,7 +116,9 @@ namespace GFGGame
             if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) boxId = LuckyBoxDataManager.BOX_ID_2;
             LuckyBoxDataManager.Instance.currentBoxId = boxId;
 
-            isActiveBoxOpen = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1) >= 0;
+            int result = await LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo();
+
+            isActiveBoxOpen = result > 0;
             if (isActiveBoxOpen)
             {
                 Timers.inst.Add(1, 0, CheckTime);
@@ -216,12 +218,6 @@ namespace GFGGame
             }
         }
 
-        // private void UpdateTime(object param)
-        // {
-        //     GTextField txtTime = _ui.m_listBg.GetChildAt(0).asCom.GetChild("txtTime").asTextField;
-        //     txtTime.text = TimeUtil.FormattingTime(LuckyBoxDataManager.Instance.startTime, LuckyBoxDataManager.Instance.startTime);
-        // }
-
         private void UpdateBg(object param)
         {
             string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId).resArr;
@@ -262,14 +258,6 @@ namespace GFGGame
             _ui.m_btnLeft.grayed = _curIndex <= 0;
             _ui.m_btnRight.grayed = _curIndex >= _ui.m_listBg.numItems - 1;
 
-            // if (LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_1)
-            // {
-            //     Timers.inst.Add(1, 0, CheckTime);
-            // }
-            // else
-            // {
-            //     Timers.inst.Remove(CheckTime);
-            // }
         }
 
         private void CheckTime(object param = null)

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -249,7 +249,7 @@ namespace GFGGame
         private void OnBtnShopClick()
         {
             object[] gobackParamDatas = new object[] { _tabIndex, _subtabIndex, _ui.m_comNormal.m_comBoBox.selectedIndex };
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas }, true);
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas });
         }
 
         /// <summary>

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs

@@ -1,5 +1,5 @@
 using UI.RoleInfo;
-using System.Text.RegularExpressions;
+using System.Collections.Generic;
 using FairyGUI;
 using UI.CommonGame;
 
@@ -8,6 +8,8 @@ namespace GFGGame
     public class ChangeHeadView : BaseWindow
     {
         private UI_ChangeHead _ui;
+        private List<ItemCfg> _headCfgs = new List<ItemCfg>();
+        private List<ItemCfg> _headBorderCfgs = new List<ItemCfg>();
         private int _selectHeadId = 0;
         private int _selectHeadBorderId = 0;
 
@@ -47,6 +49,10 @@ namespace GFGGame
             base.OnShown();
             RoleInfoManager.Instance.SortHeadDatas();
             RoleInfoManager.Instance.SortHeadBorderDatas();
+            _headCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEAD));
+            _headCfgs = SoreItemCfgDatas(_headCfgs);
+            _headBorderCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEADBORDER));
+            _headBorderCfgs = SoreItemCfgDatas(_headBorderCfgs);
             OnTabChange();
             // _ui.m_list.selectedIndex = 0;
             // _ui.m_listBorder.selectedIndex = 0;
@@ -56,11 +62,18 @@ namespace GFGGame
         {
             base.OnHide();
             _ui.m_c1.selectedIndex = 0;
+            _headCfgs.Clear();
+            _headBorderCfgs.Clear();
         }
         private async void OnBtnSureClick()
         {
             if (_ui.m_c1.selectedIndex == 0)
             {
+                if (ItemDataManager.GetItemNum(_selectHeadId) <= 0)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("暂未获得");
+                    return;
+                }
                 bool result = await RoleInfoSProxy.ReqModifyRoleHead(_selectHeadId);
                 if (result)
                 {
@@ -69,6 +82,11 @@ namespace GFGGame
             }
             else
             {
+                if (ItemDataManager.GetItemNum(_selectHeadBorderId) <= 0)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("暂未获得");
+                    return;
+                }
                 bool result = await RoleInfoSProxy.ReqModifyRoleHeadBorder(_selectHeadBorderId);
                 if (result)
                 {
@@ -79,11 +97,11 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            int headId = RoleInfoManager.Instance.headDatas[index];
-            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(headId);
+            int headId = _headCfgs[index].id;
             UI_ListHeadItem item = UI_ListHeadItem.Proxy(obj);
-            item.m_loaIcon.url = ResPathUtil.GetHeadPath(cfg.res);
+            item.m_loaIcon.url = ResPathUtil.GetHeadPath(_headCfgs[index].res);
             item.m_imgNew.visible = RoleInfoManager.Instance.isNewHead(headId);
+            item.m_imgUnGet.visible = ItemDataManager.GetItemNum(headId) <= 0;
             if (RoleInfoManager.Instance.isNewHead(headId))
             {
                 ItemProxy.ReqSetItemRead(headId).Coroutine();
@@ -98,12 +116,13 @@ namespace GFGGame
         private void RenderListBorderItem(int index, GObject obj)
         {
             ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(RoleDataManager.headId);
-            int headBorderId = RoleInfoManager.Instance.headBorderDatas[index];
-            ItemCfg borderCfg = ItemCfgArray.Instance.GetCfg(headBorderId);
+            ItemCfg borderCfg = _headBorderCfgs[index];
+            int headBorderId = borderCfg.id;
             UI_ListHeadBorderItem item = UI_ListHeadBorderItem.Proxy(obj);
             item.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
             item.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(borderCfg.res);
             item.m_imgNew.visible = RoleInfoManager.Instance.isNewHeadBorder(headBorderId);
+            item.m_imgUnGet.visible = ItemDataManager.GetItemNum(headBorderId) <= 0;
             if (RoleInfoManager.Instance.isNewHeadBorder(headBorderId))
             {
                 ItemProxy.ReqSetItemRead(headBorderId).Coroutine();
@@ -120,6 +139,7 @@ namespace GFGGame
         {
             GObject obj = context.data as GObject;
             _selectHeadId = (int)obj.data;
+
             UpdateView();
         }
 
@@ -127,6 +147,7 @@ namespace GFGGame
         {
             GObject obj = context.data as GObject;
             _selectHeadBorderId = (int)obj.data;
+
             UpdateView();
         }
 
@@ -136,11 +157,11 @@ namespace GFGGame
             _selectHeadBorderId = RoleDataManager.headBorderId;
             if (_ui.m_c1.selectedIndex == 0)
             {
-                _ui.m_list.numItems = RoleInfoManager.Instance.headDatas.Count;
+                _ui.m_list.numItems = _headCfgs.Count;
             }
             else
             {
-                _ui.m_listBorder.numItems = RoleInfoManager.Instance.headBorderDatas.Count; ;
+                _ui.m_listBorder.numItems = _headBorderCfgs.Count;
             }
             UpdateView();
         }
@@ -161,5 +182,18 @@ namespace GFGGame
                 _ui.m_txtDesc.text = headBorderCfg.desc;
             }
         }
+        private List<ItemCfg> SoreItemCfgDatas(List<ItemCfg> list)
+        {
+            list.Sort((ItemCfg a, ItemCfg b) =>
+            {
+                long hasA = ItemDataManager.GetItemNum(a.id);
+                long hasB = ItemDataManager.GetItemNum(b.id);
+                if (hasA > 0 && hasB <= 0) return -1;
+                if (hasB > 0 && hasA <= 0) return 1;
+
+                return a.id - b.id;
+            });
+            return list;
+        }
     }
 }

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

@@ -49,6 +49,7 @@ namespace GFGGame
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_ARENA, menu2);
+            _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
             _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
             UpdateView();

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

@@ -0,0 +1,93 @@
+using System;
+using ET;
+using FairyGUI;
+using UI.Store;
+using UI.CommonGame;
+namespace GFGGame
+{
+    public class StoreBlackCardRewardView : BaseWindow
+    {
+        private UI_StoreBlackCardRewardUI _ui;
+        private int _month;
+        private int _day;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoreBlackCardRewardUI.PACKAGE_NAME;
+            _ui = UI_StoreBlackCardRewardUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_comBg.GetChild("btnClose").asCom.onClick.Add(Hide);
+            _ui.m_list.itemRenderer = RenderListItem;
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            _month = TimeUtil.GetCurMonth();
+            _ui.m_list.numItems = MonthlyCardClothesCfgArray.Instance.GetCfgsByyear(TimeUtil.GetCurYear()).Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_ListBlackRewardtem item = UI_ListBlackRewardtem.Proxy(obj);
+            MonthlyCardClothesCfg clothesCfg = MonthlyCardClothesCfgArray.Instance.GetCfgsByyear(TimeUtil.GetCurYear())[index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(clothesCfg.clothesArr[0]);
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+
+            item.m_txtMonth.text = string.Format("{0}月", clothesCfg.month);
+
+            bool isCurMonth = clothesCfg.month == _month;
+            item.m_imgMask.visible = !isCurMonth;
+            item.m_grpMonth.visible = isCurMonth;
+            item.m_grpName.visible = isCurMonth;
+
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnBtnGetClick);
+            }
+            item.target.data = clothesCfg.month;
+
+            UI_ListBlackRewardtem.ProxyEnd();
+        }
+
+        private void OnBtnGetClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+
+            int month = (int)obj.data;
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs.meta

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

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

@@ -49,6 +49,7 @@ namespace GFGGame
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, menu2);
+            _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
             _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
             UpdateView();

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

@@ -49,6 +49,7 @@ namespace GFGGame
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
+            _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
             _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
             UpdateView();

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

@@ -39,8 +39,10 @@ namespace GFGGame
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnBuy.target.onClick.Add(OnBtnBuyCardClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
+            _ui.m_btnBlackReward.onClick.Add(OnBtnBlackRewardClick);
         }
         protected override void AddEventListener()
         {
@@ -65,10 +67,16 @@ namespace GFGGame
         {
             base.RemoveEventListener();
         }
+        private void OnBtnBlackRewardClick()
+        {
+            ViewManager.Show<StoreBlackCardRewardView>();
+        }
         private void UpdateView()
         {
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_MONTH_CARD, menu2);
+            _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
+            _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
             _ui.m_list.numItems = _shopCfgs.Count;
 
             MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege1);
@@ -96,6 +104,8 @@ namespace GFGGame
                     }
                     _ui.m_txtMoneyCount.text = privilegeCfg.value1Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value1Arr[1].ToString();
+                    _ui.m_btnBlackReward.visible = false;
+                    _ui.m_btnRule.data = 300010;
                     break;
                 case ConstStoreSubId.STORE_MONTH_BLACK_CARD:
                     iconUrl = "ui://Store/MonthCard_Icon";
@@ -113,6 +123,8 @@ namespace GFGGame
 
                     _ui.m_txtMoneyCount.text = privilegeCfg.value2Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value2Arr[1].ToString();
+                    _ui.m_btnBlackReward.visible = true;
+                    _ui.m_btnRule.data = 300011;
                     break;
             }
 
@@ -132,6 +144,7 @@ namespace GFGGame
             _ui.m_loaMoney.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(privilegeCfg.paramsArr[0]).res);
             _ui.m_loaDailyMoney.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(privilegeCfg.paramsArr[0]).res);
             _ui.m_txtPrivilegeCount.text = privilegeCount.ToString();
+            _ui.m_txtTPrivilege.SetVar("value", privilegeCount.ToString()).FlushVars();
             _ui.m_btnGet.enabled = endTime > TimeHelper.ServerNow() && !isGot;
             _ui.m_btnGet.text = isGot ? "已领取" : "领取";
             _ui.m_btnGet.data = monthCfg.type; ;

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

@@ -14,6 +14,8 @@ namespace GFGGame
         private UI_StoreUI _ui;
         // private ValueBarController _valueBarController;
         private List<List<string>> _arenaSubTab = new List<List<string>>();
+
+        private List<string[]> _storeTabCfgs = new List<string[]>();
         private int _curTabIndex = 0;
         private int _curSubTabIndex = 0;
         private string _curViewName = "";
@@ -38,19 +40,14 @@ namespace GFGGame
             isfullScreen = true;
             this.bringToFontOnClick = false;
 
-            StoreTabCfg charge = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_CHARGE);
-            Debug.Log("charge[0]" + charge.subTabArr[0][0]);
-            Debug.Log("charge[0]" + charge.subTabArr[0][1]);
-            Debug.Log("charge[0]" + charge.subTabArr[0][2]);
-            Debug.Log("charge[1]" + charge.subTabArr[1][0]);
-            Debug.Log("charge[1]" + charge.subTabArr[1][1]);
-            Debug.Log("charge[1]" + charge.subTabArr[1][2]);
-            StoreTabCfg arenaTab = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_ARENA);
-            _arenaSubTab.Add(new List<string>() { arenaTab.subTabArr[0][0], arenaTab.subTabArr[0][1], arenaTab.subTabArr[0][2] });
-            for (int i = ArenaDataManager.Instance.SeasonId; i > 0; i--)
-            {
-                _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), i.ToString(), "StoreArenaView" });
-            }
+            // StoreTabCfg charge = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_CHARGE);
+            // Debug.Log("charge[0]" + charge.subTabArr[0][0]);
+            // Debug.Log("charge[0]" + charge.subTabArr[0][1]);
+            // Debug.Log("charge[0]" + charge.subTabArr[0][2]);
+            // Debug.Log("charge[1]" + charge.subTabArr[1][0]);
+            // Debug.Log("charge[1]" + charge.subTabArr[1][1]);
+            // Debug.Log("charge[1]" + charge.subTabArr[1][2]);
+
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sc_beijing");
 
@@ -68,11 +65,16 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            //this.viewData[functionId][subTabIndex]
+            StoreTabCfg arenaTab = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_ARENA);
+            _arenaSubTab.Clear();
+            _arenaSubTab.Add(new List<string>() { arenaTab.subTabArr[0][0], arenaTab.subTabArr[0][1], arenaTab.subTabArr[0][2] });
+            for (int i = ArenaDataManager.Instance.SeasonId; i > 0; i--)
+            {
+                _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), i.ToString(), "StoreArenaView" });
+            }
+
             _curTabIndex = this.viewData == null ? ConstStoreTabId.STORE_CHARGE : (int)(this.viewData as object[])[0];
 
-            // StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(tabIndex);
-            // _curTabIndex = tabCfg == null ? 1 : tabCfg.index;
             _ui.m_comTab.m_c1.selectedIndex = _curTabIndex;
             _ui.m_comTab.target.scrollPane.SetPercX((float)(_curTabIndex - 1) / (float)StoreTabCfgArray.Instance.dataArray.Length, false);
 
@@ -100,7 +102,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             ViewManager.Hide(_curViewName);
-            ViewManager.GoBackFrom(typeof(StoreView).FullName, false);
+            this.Hide();
         }
 
         private void OnTabChange()
@@ -118,7 +120,26 @@ namespace GFGGame
             }
             else
             {
-                _ui.m_listSubTab.numItems = tabCfg.subTabArr.Length;
+                _storeTabCfgs.Clear();
+                if (tabCfg.index == ConstStoreTabId.STORE_GIFT_BAG)
+                {
+                    for (int i = 0; i < tabCfg.subTabArr.Length; i++)
+                    {
+                        int menu2 = int.Parse(tabCfg.subTabArr[i][1]);
+                        if (menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY)
+                        {
+                            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
+                            if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0) continue;
+                        }
+                        _storeTabCfgs.Add(tabCfg.subTabArr[i]);
+                    }
+
+                }
+                else
+                {
+                    _storeTabCfgs = new List<string[]>(tabCfg.subTabArr);
+                }
+                _ui.m_listSubTab.numItems = _storeTabCfgs.Count;
             }
             _ui.m_listSubTab.selectedIndex = 0;
             _curSubTabIndex = 0;
@@ -136,8 +157,8 @@ namespace GFGGame
             }
             else
             {
-                item.title = tabCfg.subTabArr[index][0];
-                menu2 = int.Parse(tabCfg.subTabArr[index][1]);
+                item.title = _storeTabCfgs[index][0];
+                menu2 = int.Parse(_storeTabCfgs[index][1]);
             }
             item.data = index;
             if (menu2 == ConstStoreSubId.STORE_CHARGE_ADDUP)
@@ -165,8 +186,8 @@ namespace GFGGame
             }
             else
             {
-                menu2 = int.Parse(tabCfg.subTabArr[index][1]);
-                viewName = tabCfg.subTabArr[index][2];
+                menu2 = int.Parse(_storeTabCfgs[index][1]);
+                viewName = _storeTabCfgs[index][2];
             }
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(viewName))
             {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -11,8 +11,8 @@ namespace GFGGame
     {
         private UI_StudioBuyNumUI _ui;
         private int _limitId;
-        private RoleLimitData _studioData;
-        private LimitCfg _studioCfg;
+        private RoleLimitData _limitData;
+        private LimitCfg _limitCfg;
 
         private int _index;
 
@@ -50,25 +50,41 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _limitId = (int)this.viewData;
+            _limitData = RoleLimitDataManager.GetLimitData(_limitId);
+            _limitCfg = LimitCfgArray.Instance.GetCfg(_limitId);
+
             UpdateView();
         }
 
 
         private void UpdateView()
         {
-            _limitId = (int)this.viewData;
-            _studioData = RoleLimitDataManager.GetLimitData(_limitId);
-            _studioCfg = LimitCfgArray.Instance.GetCfg(_limitId);
-
             _ui.m_c1.selectedIndex = 0;
-            _ui.m_txtNum.text = string.Format("(今天已兑换{0}/{1}次)", _studioData.BuyTimes, _studioCfg.buyNum);
+            _ui.m_txtNum1.visible = false;
+            _ui.m_txtNum0.text = string.Format("(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
+
+            List<MonthlyCardPrivilegeCfg> privilegeCfgs = MonthlyCardPrivilegeCfgArray.Instance.GetCfgsByparamsType(1);
+            for (int i = 0; i < privilegeCfgs.Count; i++)
+            {
+                if (privilegeCfgs[i].paramsArr[0] == _limitId)
+                {
+                    _ui.m_txtNum1.visible = true;
+                    string str0 = privilegeCfgs[i].value1Arr[0] > 0 ? string.Format("金卡+{0}次", privilegeCfgs[i].value1Arr[0]) : "";
+                    string str1 = privilegeCfgs[i].value2Arr[0] > 0 ? string.Format("黑金卡+{0}次", privilegeCfgs[i].value2Arr[0]) : "";
+                    _ui.m_txtNum0.text = string.Format("1.{0}{1}{2}", str0, !string.IsNullOrEmpty(str0) && !string.IsNullOrEmpty(str1) ? "," : "", str1);
+                    _ui.m_txtNum1.text = string.Format("2.道具兑换(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
+                    break;
+                }
+            }
+
 
-            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostItem, _studioCfg.itemID, _studioCfg.itemNum, true);
+            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostItem, _limitCfg.itemID, _limitCfg.itemNum, true);
 
-            if (_studioCfg.moneyId <= 0) return;
+            if (_limitCfg.moneyId <= 0) return;
             _ui.m_c1.selectedIndex = 1;
-            LimitCfgArray.Instance.GetMoneyIdAndNum(_studioCfg.id, _studioData.BuyTimes, 1, out int moneyId, out int moneyNum);
-            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostCurrent, _studioCfg.moneyId, moneyNum, true);
+            LimitCfgArray.Instance.GetMoneyIdAndNum(_limitCfg.id, _limitData.BuyTimes, 1, out int moneyId, out int moneyNum);
+            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostCurrent, _limitCfg.moneyId, moneyNum, true);
 
         }
 
@@ -83,14 +99,14 @@ namespace GFGGame
         }
         private void OnClickBtnBuy(int type)
         {
-            if (_studioData.BuyTimes == _studioCfg.buyNum)
+            if (_limitData.BuyTimes == _limitCfg.buyNum)
             {
                 PromptController.Instance.ShowFloatTextPrompt("今日购买次数已达上限", MessageType.ERR);
                 return;
             }
-            LimitCfgArray.Instance.GetMoneyIdAndNum(_studioCfg.id, _studioData.BuyTimes, 1, out int moneyId, out int moneyNum);
+            LimitCfgArray.Instance.GetMoneyIdAndNum(_limitCfg.id, _limitData.BuyTimes, 1, out int moneyId, out int moneyNum);
 
-            if (type == BUY_TYPE_0 && ItemDataManager.GetItemNum(_studioCfg.itemID) < _studioCfg.itemNum || type == BUY_TYPE_1 && ItemDataManager.GetItemNum(moneyId) < moneyNum)
+            if (type == BUY_TYPE_0 && ItemDataManager.GetItemNum(_limitCfg.itemID) < _limitCfg.itemNum || type == BUY_TYPE_1 && ItemDataManager.GetItemNum(moneyId) < moneyNum)
             {
                 PromptController.Instance.ShowFloatTextPrompt("道具不足", MessageType.ERR);
                 return;
@@ -100,13 +116,13 @@ namespace GFGGame
         }
         private void OnLimitChanged(EventContext context = null)
         {
-            if((int)context.data != _limitId)
+            if ((int)context.data != _limitId)
             {
                 return;
             }
             PromptController.Instance.ShowFloatTextPrompt("购买成功", MessageType.SUCCESS);
             UpdateView();
-            if (_studioData.BuyTimes == _studioCfg.buyNum)
+            if (_limitData.BuyTimes == _limitCfg.buyNum)
             {
                 PromptController.Instance.ShowFloatTextPrompt("今日购买次数已达上限", MessageType.ERR);
                 this.Hide();