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

* 'master' of http://10.108.64.190:3000/gfg/Client:
  导表
  导表
  月卡相关
  公用机提交
  公用机提交
  竞技场换字
  公用机提交
  雅集招募时间
  商店
  商店礼包锁
  雅集福利加锁
  竞技场改飞花令
  商店显示
  商店valueBar
  商店valuebar
  商店跳转

FGUIProject/assets/Arena/components/ComValueInfo.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="277,254">
   <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5,,6,,7,,8,,9,,10,,11,,12,,13,,14," selected="0"/>
-  <controller name="c2" pages="0,,1," selected="1"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <controller name="c3" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n91_jcej" name="n91" src="jcej2h" fileName="imagesExport/jjsy_zldi.png" pkg="eg2y0ldp" xy="0,0" size="282,56" group="n92_jcej">
       <relation target="n82_jcej" sidePair="width-width"/>
     </image>
-    <text id="n82_jcej" name="txtFightScore" xy="48,7" size="219,39" group="n92_jcej" fontSize="28" color="#a07943" vars="true" text="竞技场战力：{value=000}"/>
+    <text id="n82_jcej" name="txtFightScore" xy="48,7" size="213,39" group="n92_jcej" fontSize="28" color="#a07943" vars="true" text="飞花令战力：{value=000}"/>
     <component id="n108_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="10,13" size="29,29" group="n92_jcej">
-      <Button checked="true" icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
+      <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
     <group id="n92_jcej" name="n92" xy="0,0" size="282,56"/>
     <image id="n83_jcej" name="n83" src="jcej3s" fileName="imagesExport/dz_hz_fsk_1.png" pkg="eg2y0ldp" xy="1,70" size="248,57" group="n86_jcej"/>
@@ -22,7 +22,7 @@
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
     <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="15,187" group="n90_jcej"/>
-    <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="18,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
+    <text id="n89_jcej" name="txtTagScore" xy="177,187" pivot="0.5,0" size="16,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
     <image id="n96_jcej" name="n96" src="jcej2m" fileName="imagesExport/jjsy_xx_2.png" pkg="eg2y0ldp" xy="16,229" group="n101_jcej"/>
     <image id="n97_jcej" name="n97" src="jcej2m" fileName="imagesExport/jjsy_xx_2.png" pkg="eg2y0ldp" xy="32,229" group="n101_jcej"/>
     <image id="n98_jcej" name="n98" src="jcej2m" fileName="imagesExport/jjsy_xx_2.png" pkg="eg2y0ldp" xy="48,229" group="n101_jcej"/>

FGUIProject/assets/Arena/components/ListFightRecordItem.xml

@@ -11,7 +11,7 @@
     <remark page="1" value="胜利"/>
   </controller>
   <displayList>
-    <text id="n4_psph" name="txtTime" xy="50,0" pivot="0.5,0" size="193,36" group="n11_psph" fontSize="26" color="#a99070" align="center" autoClearText="true" text="10分钟 发起挑战"/>
+    <text id="n4_psph" name="txtTime" xy="51,0" pivot="0.5,0" size="190,36" group="n11_psph" fontSize="26" color="#a99070" align="center" autoClearText="true" text="10分钟 发起挑战"/>
     <image id="n13_jcej" name="n13" src="jcej1u" fileName="images/bpjly_xixian.png" xy="18,13" size="862,14" group="n11_psph"/>
     <loader id="n1_psph" name="loaResult" xy="5,47" size="888,151" group="n11_psph" url="ui://4lc5fhlbjcej2y" autoSize="true">
       <gearIcon controller="ctrResult" pages="1" values="ui://4lc5fhlbjcej2x" default="ui://4lc5fhlbjcej2y"/>
@@ -21,9 +21,9 @@
     </loader>
     <loader id="n3_psph" name="loaDanIcon" xy="229,69" size="108,101" group="n11_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <text id="n14_jcej" name="n14" xy="423,71" pivot="0.5,0" anchor="true" size="71,46" group="n11_psph" fontSize="34" color="#c09c6d" align="center" vars="true" text="排名"/>
-    <text id="n5_psph" name="txtRank" xy="423,107" pivot="0.5,0" anchor="true" size="133,64" group="n11_psph" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" vars="true" bold="true" text="10000"/>
+    <text id="n5_psph" name="txtRank" xy="423,107" pivot="0.5,0" anchor="true" size="116,64" group="n11_psph" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" vars="true" bold="true" text="10000"/>
     <text id="n7_psph" name="txtTargetName" xy="582,69" size="148,49" group="n11_psph" fontSize="36" color="#c09c6d" autoClearText="true" text="对手名字"/>
-    <text id="n8_psph" name="txtTargetFightScore" xy="582,122" size="219,39" group="n11_psph" fontSize="28" color="#c09c6d" text="竞技场战力：999"/>
+    <text id="n8_psph" name="txtTargetFightScore" xy="582,122" size="213,39" group="n11_psph" fontSize="28" color="#c09c6d" text="飞花令战力：999"/>
     <component id="n15_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="509,90" size="58,59" group="n11_psph"/>
     <component id="n9_psph" name="btnShow" src="psph14" fileName="components/BtnShow.xml" xy="832,97" size="37,46" group="n11_psph">
       <Button controller="c1" page="1"/>

FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -2,19 +2,19 @@
 <component size="888,151">
   <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="19,41" pivot="0.5,0" size="150,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
+    <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="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/ComLv.xml" pkg="eg2y0ldp" xy="273,99" group="n35_v461" scale="0.9,0.9"/>
+    <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"/>
-    <text id="n14_psph" name="txtName" xy="331,20" size="48,52" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
+    <text id="n14_psph" name="txtName" xy="331,20" 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="330,71" group="n29_jcej"/>
-    <text id="n15_psph" name="txtFightScore" xy="331,78" size="205,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力：--"/>
+    <text id="n15_psph" name="txtFightScore" xy="331,78" size="209,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="飞花令战力：--"/>
     <group id="n29_jcej" name="n29" xy="330,20" size="236,97" group="n18_psph"/>
     <loader id="n16_psph" name="loaDanIcon" xy="600,20" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n26_jcej" name="n26" xy="729,24" size="122,42" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
-    <text id="n17_psph" name="txtDanRank" xy="764,58" 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="729,24" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
+    <text id="n17_psph" name="txtDanRank" xy="760,58" 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="729,24" size="122,90" group="n18_psph"/>
     <group id="n18_psph" name="n18" xy="19,-18" size="832,230"/>
   </displayList>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -32,8 +32,9 @@
     <text id="n22_si5z" name="txtCostCount" xy="343,624" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
     <group id="n19_si5z" name="n19" xy="175,616" size="612,70" group="n34_l500"/>
     <text id="n24_si5z" name="txtTips" xy="319,706" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="416,797" pivot="0.5,0" group="n26_si5z" controller="c1,0"/>
-    <group id="n26_si5z" name="n26" xy="318,706" size="326,137" group="n34_l500" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="416,797" pivot="0.5,0" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
+    <text id="n36_l500" name="txtRmbCost" xy="450,787" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
+    <group id="n26_si5z" name="n26" xy="319,706" size="323,135" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
     <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,863" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>

FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n0_r9gf" name="n0" src="qkjstle" fileName="imagesNew/Resources_Underprint.png" xy="1,13" size="238,42" group="n4_qqat"/>
-    <image id="n3_r9gf" name="n3" src="qkjstld" fileName="imagesNew/fzd_jia.png" xy="175,9" group="n4_qqat"/>
+    <image id="n3_r9gf" name="imgAdd" src="qkjstld" fileName="imagesNew/fzd_jia.png" xy="175,9" group="n4_qqat"/>
     <text id="n1_r9gf" name="title" xy="83,14" pivot="0.5,0" size="72,39" group="n4_qqat" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#ffffff" vAlign="middle" singleLine="true" autoClearText="true" text="66666"/>
     <loader id="n2_r9gf" name="icon" xy="17,14" pivot="0.5,0.5" size="40,40" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" fill="scale"/>
     <group id="n4_qqat" name="n4" xy="1,9" size="238,50"/>

FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,70" opaque="false">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12,,13," selected="11">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12,,13,,14," selected="12">
     <remark page="0" value="体力金币马蹄珍珠"/>
     <remark page="1" value="体力金币马蹄"/>
     <remark page="2" value="抽卡兑换"/>
@@ -13,6 +13,7 @@
     <remark page="9" value="金币马蹄珍珠"/>
     <remark page="10" value="竞技场"/>
     <remark page="11" value="雅集"/>
+    <remark page="12" value="商店列表"/>
   </controller>
   <displayList>
     <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
@@ -65,10 +66,16 @@
       <gearXY controller="c1" pages="0,1,3,5,6,8,10,12" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpkztethq"/>
     </component>
-    <component id="n50_pvb4" name="btnLeagueContribuation" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,1">
+    <component id="n50_pvb4" name="btnLeagueContribuation" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="13"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,10,12,13" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0|814,1" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpkztethq"/>
     </component>
+    <list id="n51_l500" name="list" xy="232,0" size="821,70" layout="row" colGap="30" defaultItem="ui://eg2y0ldpr9gf5z" align="right">
+      <gearDisplay controller="c1" pages="14"/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -43,9 +43,7 @@
     <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="544,1564" group="n25_rv09">
       <Button title="雅集信息"/>
     </component>
-    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="771,1562" group="n25_rv09">
-      <Button title="退出雅集"/>
-    </component>
+    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="771,1562" group="n25_rv09"/>
     <group id="n25_rv09" name="n25" xy="90,1562" size="900,61" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/League/components/Button14.xml

@@ -15,7 +15,7 @@
     <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
-    <text id="n5_rv09" name="txtTime" xy="5,61" pivot="0.5,0" size="176,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" autoClearText="true" text="剩余时间23：59">
+    <text id="n5_rv09" name="txtTime" xy="-13,61" pivot="0.5,0" size="213,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" autoClearText="true" text="剩余时间：23:59:00">
       <gearDisplay controller="touchable" pages="0"/>
     </text>
     <component id="n6_a0cf" name="comcost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="27,54">

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -4,8 +4,8 @@
     <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,0" group="n22_9jv6"/>
     <loader id="n12_pvb4" name="loaIcon" xy="134,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
     <text id="n15_pvb4" name="txtCount" xy="210,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余：1/1"/>
-     <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="126,588" group="n22_9jv6" pkg="eg2y0ldp">
-      <Button title="采购" icon="ui://eg2y0ldp9jv66c"/> 
+    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/BtnStyle1Small.xml" pkg="eg2y0ldp" xy="126,588" group="n22_9jv6">
+      <Button title="采购" icon="ui://eg2y0ldp9jv66c"/>
     </component>
     <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
     <list id="n13_pvb4" name="listGift" xy="-113,485" pivot="0.5,0" size="601,132" group="n22_9jv6" scale="0.65,0.65" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
@@ -17,5 +17,9 @@
     <text id="n18_pvb4" name="txtTime" xy="258,117" pivot="0.5,0" size="102,39" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#be8f4d" align="center" ubb="true" text="剩余1天"/>
     <loader id="n21_9jv6" name="loaType" xy="19,99" size="62,203" group="n22_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
     <group id="n22_9jv6" name="n22" xy="-113,0" size="601,801"/>
+    <image id="n24_l500" name="n24" src="l5007z" fileName="images/yj_zz.png" xy="2,362" group="n26_l500"/>
+    <text id="n25_l500" name="txtLock" xy="35,367" pivot="0.5,0" size="305,39" group="n26_l500" fontSize="28" color="#fffdf9" text="宴客厅等级达到X级解锁"/>
+    <image id="n23_l500" name="n23" src="l5007y" fileName="images/yj_db_zz.png" xy="-1,35" group="n26_l500"/>
+    <group id="n26_l500" name="grpLock" xy="-1,35" size="377,770" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -195,9 +195,11 @@
     <image id="miy37q" name="ch_jn_db.png" path="/images/"/>
     <image id="miy37r" name="card_sz_db.png" path="/images/" scale="9grid" scale9grid="12,7,24,14"/>
     <image id="miy37s" name="lm_ch_jdk.png" path="/images/"/>
-    <image id="miy37u" name="dikuang_sx.png" path="/imagesNew/"/>
     <component id="miy37v" name="ListSkillScore.xml" path="/"/>
     <component id="miy37w" name="Button124.xml" path="/"/>
+    <image id="l5007x" name="tb_suo_gold.png" path="/images/"/>
+    <image id="l5007y" name="yj_db_zz.png" path="/images/"/>
+    <image id="l5007z" name="yj_zz.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/StoreChargeAddUpUI.xml

@@ -2,6 +2,7 @@
 <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换算成会员经验"/>
+    <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">
       <relation target="" sidePair="bottomext-bottom"/>

FGUIProject/assets/Store/StoreChargeUI.xml

@@ -2,6 +2,7 @@
 <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换算成会员经验"/>
+    <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">
       <relation target="" sidePair="bottomext-bottom"/>

FGUIProject/assets/Store/StoreExchangeUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
-    <list id="n0_l500" name="list" xy="74,513" size="932,1316" layout="flow_hz" overflow="scroll" lineGap="30" colGap="10" defaultItem="ui://p9mtgheo10not1t" autoClearItems="true">
+    <list id="n0_l500" name="list" xy="83,513" size="913,1316" layout="flow_hz" overflow="scroll" lineGap="20" colGap="10" defaultItem="ui://p9mtgheo10not1t" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -17,5 +17,6 @@
     <component id="n2_l500" name="n2" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
+    <component id="n4_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,14"/>
   </displayList>
 </component>

FGUIProject/assets/Store/StoreGiftBagUI.xml

@@ -17,5 +17,6 @@
     <component id="n2_l500" name="n2" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
+    <component id="n3_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,14"/>
   </displayList>
 </component>

FGUIProject/assets/Store/StoreUI.xml

@@ -8,7 +8,6 @@
     <image id="n17_fqor" name="n17" src="fqortb7" fileName="imagesNew/sc_beijing_shang.png" xy="0,0"/>
     <image id="n14_fqor" name="n14" src="fqortb6" fileName="imagesNew/sc_beijing_hua.png" xy="622,0"/>
     <image id="n9_fqor" name="n9" src="fqortb3" fileName="imagesNew/sc_line1.png" xy="81,444"/>
-    <component id="n2_fqor" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <component id="n1_fqor" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n10_fqor" name="n10" src="fqortb2" fileName="imagesNew/sc_line2.png" xy="55,327"/>
     <image id="n19_fqor" name="n19" src="fqortay" fileName="imagesNew/sc_zhuangshihua1.png" xy="0,0"/>

FGUIProject/assets/Store/components/ListChargeItem.xml

@@ -5,13 +5,13 @@
     <loader id="n15_d4iw" name="icon" xy="52,166" size="197,197" aspect="true" url="ui://p9mtgheohhx91j" fill="scaleMatchHeight"/>
     <image id="n12_d4iw" name="imgDouble" src="hhx9a" fileName="imagesNew/wp_save_baseboard.png" xy="-1,338"/>
     <image id="n24_hhx9" name="n24" src="fqortau" fileName="imagesNew/sc_xian.png" xy="33,104" size="236,4"/>
-    <text id="n16_d4iw" name="txtName" xy="80,52" pivot="0.5,0" size="142,54" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#5a3e16" align="center" text="钻石600">
+    <text id="n16_d4iw" name="txtName" xy="13,56" pivot="0.5,0" size="275,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#5a3e16" align="center" letterSpacing="-2" text="稀有升星材料(自选)">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <component id="n14_d4iw" name="btnBuy" src="iftftaf" fileName="components/Component2.xml" xy="18,412" size="265,80">
       <relation target="" sidePair="center-center"/>
     </component>
     <text id="n18_dmsi" name="txtDesc" xy="48,380" pivot="0.5,0" size="204,36" font="ui://eg2y0ldpa0cftks" fontSize="26" color="#ac4100" letterSpacing="-2" text="首充赠送+6000钻石"/>
-    <text id="n23_hhx9" name="n23" xy="9,337" size="122,42" fontSize="30" color="#ffffff" text="首充双倍"/>
+    <text id="n23_hhx9" name="n23" xy="9,337" size="122,41" fontSize="30" color="#ffffff" text="首充双倍"/>
   </displayList>
 </component>

FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="460,270" overflow="hidden">
-  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1">
+<component size="451,270" overflow="hidden">
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="0">
     <remark page="0" value="可购买"/>
     <remark page="1" value="已售罄"/>
   </controller>
@@ -12,27 +12,32 @@
     <image id="n22_10not" name="n22" src="hhx91f" fileName="imagesNew/GiftBag_baseboard1.png" xy="26,0"/>
     <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="0,-1" group="n26_10not"/>
     <text id="n48_l500" name="n48" xy="17,7" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
-    <text id="n49_l500" name="txtDesc" xy="13,32" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
-    <text id="n50_l500" name="n50" xy="68,42" size="22,36" group="n51_l500" fontSize="26" color="#ffffff" letterSpacing="-2" text="%"/>
-    <group id="n51_l500" name="n51" xy="13,32" size="77,51" group="n26_10not" advanced="true" layout="hz" excludeInvisibles="true">
+    <text id="n49_l500" name="txtDesc" xy="8,32" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
+    <text id="n50_l500" name="n50" xy="63,42" size="22,36" group="n51_l500" fontSize="26" color="#ffffff" letterSpacing="-2" text="%"/>
+    <group id="n51_l500" name="n51" xy="8,32" size="77,51" group="n26_10not" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
+    <image id="n59_l500" name="n59" src="l500tbu" fileName="imagesNew/sc_yk_zz2.png" xy="0,-1" group="n26_10not">
+      <gearDisplay controller="c2" pages="0"/>
+    </image>
     <group id="n26_10not" name="grpDiscount" xy="0,-1" size="100,96" advanced="true"/>
     <loader id="n23_10not" name="icon" xy="61,55" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
-    <text id="n27_10not" name="txtName" xy="328,26" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
+    <text id="n27_10not" name="txtName" xy="248,14" pivot="0.5,0" anchor="true" size="261,44" fontSize="32" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="稀有升星材料(自选)"/>
     <text id="n29_10not" name="txtEndTime" xy="81,220" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" text="1天后下架"/>
     <text id="n32_10not" name="txtLimit" xy="229,76" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
-    <text id="n31_10not" name="txtLock" xy="330,111" pivot="0.5,0" anchor="true" size="239,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" text="飞花令达到段位07解锁">
-      <gearDisplay controller="c2" pages="0"/>
-    </text>
-    <text id="n44_iftf" name="n44" xy="299,120" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
+    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="257,184">
+      <gearDisplay controller="c1" pages="0"/>
+    </component>
+    <text id="n58_l500" name="n58" xy="268,176" pivot="0.5,0" size="124,54" fontSize="40" color="#5a3e16" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>
-    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="-7,-61" size="474,379">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="0" condition="1"/>
-    </image>
-    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="257,184"/>
+    <image id="n54_l500" name="n54" src="l500tbt" fileName="imagesNew/sc_yk_zz.png" xy="13,0" group="n57_l500"/>
+    <image id="n55_l500" name="n55" src="l500tbs" fileName="imagesNew/sc_yk_jsdb.png" xy="32,62" group="n57_l500"/>
+    <text id="n56_l500" name="txtLock" xy="238,101" pivot="0.5,0" anchor="true" size="210,67" group="n57_l500" fontSize="28" color="#fffdf9" align="center" vAlign="middle" leading="-5" letterSpacing="-2" autoSize="none" text="飞花令段位达到巴拉巴拉解锁">
+      <gearDisplay controller="c2" pages="0"/>
+    </text>
+    <group id="n57_l500" name="n57" xy="13,0" size="439,270" advanced="true">
+      <gearDisplay controller="c2" pages="0"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Store/components/ListShopItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="290,455" overflow="hidden">
-  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="0">
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1">
     <remark page="0" value="可购买"/>
     <remark page="1" value="已售罄"/>
   </controller>
@@ -10,6 +10,7 @@
   </controller>
   <displayList>
     <image id="n22_10not" name="n22" src="hhx9w" fileName="imagesNew/GiftBag_baseboard.png" xy="0,0"/>
+    <image id="n55_l500" name="n55" src="fqortau" fileName="imagesNew/sc_xian.png" xy="27,119" size="236,4"/>
     <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="191,263" group="n26_10not"/>
     <text id="n48_l500" name="n48" xy="208,271" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
     <text id="n49_l500" name="txtDesc" xy="207,301" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
@@ -19,21 +20,22 @@
     </group>
     <group id="n26_10not" name="grpDiscount" xy="191,263" size="100,96" advanced="true"/>
     <loader id="n23_10not" name="icon" xy="61,169" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
-    <text id="n27_10not" name="txtName" xy="145,72" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
+    <text id="n27_10not" name="txtName" xy="145,78" pivot="0.5,0" anchor="true" size="261,44" fontSize="32" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="稀有升星材料(自选)"/>
     <text id="n29_10not" name="txtEndTime" xy="89,340" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" vars="true" text="{value=1天}后下架"/>
     <text id="n56_l500" name="txtLimit" xy="45,121" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
-    <text id="n31_10not" name="txtLock" xy="145,150" pivot="0.5,0" anchor="true" size="229,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" text="飞花令达到段位7解锁">
-      <gearDisplay controller="c2" pages="0"/>
-    </text>
-    <text id="n57_l500" name="n57" xy="104,157" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
+    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="71,390">
+      <gearDisplay controller="c1" pages="0"/>
+    </component>
+    <text id="n57_l500" name="n57" xy="83,383" pivot="0.5,0" size="124,54" fontSize="40" color="#5a3e16" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>
-    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="0,-72" size="291,600">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="0" condition="1"/>
-    </image>
-    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="71,390"/>
-    <image id="n55_l500" name="n55" src="fqortau" fileName="imagesNew/sc_xian.png" xy="27,119" size="236,4"/>
+    <image id="n58_l500" name="n58" src="l500tbr" fileName="imagesNew/sc_lb_zz.png" xy="0,0" group="n60_l500"/>
+    <image id="n59_l500" name="n59" src="l500tbq" fileName="imagesNew/sc_lb_jsdb.png" xy="-22,189" group="n60_l500"/>
+    <text id="n31_10not" name="txtLock" xy="145,227" pivot="0.5,0" anchor="true" size="210,67" group="n60_l500" fontSize="28" color="#fffdf9" align="center" vAlign="middle" leading="-5" letterSpacing="-2" autoSize="none" text="飞花令段位达到巴拉巴拉解锁">
+      <gearDisplay controller="c2" pages="0"/>
+    </text>
+    <group id="n60_l500" name="n60" xy="-22,0" size="333,455" advanced="true">
+      <gearDisplay controller="c2" pages="0"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Store/package.xml

@@ -135,6 +135,11 @@
     <component id="l500tbe" name="ListShopItem.xml" path="/components/"/>
     <component id="l500tbf" name="StoreChargeAddUpUI.xml" path="/" exported="true"/>
     <component id="l500tbh" name="StoreExchangeUI.xml" path="/" exported="true"/>
+    <image id="l500tbq" name="sc_lb_jsdb.png" path="/imagesNew/"/>
+    <image id="l500tbr" name="sc_lb_zz.png" path="/imagesNew/"/>
+    <image id="l500tbs" name="sc_yk_jsdb.png" path="/imagesNew/"/>
+    <image id="l500tbt" name="sc_yk_zz.png" path="/imagesNew/"/>
+    <image id="l500tbu" name="sc_yk_zz2.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -11,6 +11,7 @@ namespace GFGGame
         public const int STORE_GIFT_BAG_GREATEST = 2;//精选
         public const int STORE_GIFT_BAG_HOT = 3;//热销
         public const int STORE_EXCHANGE_GALLERY = 0;//画廊商城
+        public const int STORE_EXCHANGE_LEAGUE = 1;//雅集商城
         public const int STORE_ARENA_ITEM = 0;//竞技场
         public const int FU_ZHUANG_DIAN = 0;//服装店
 

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

@@ -23,6 +23,15 @@ namespace GFGGame
             }
         }
 
+        //可领取体力的上限值
+        public int maxGetPowerCount
+        {
+            get
+            {
+                return GlobalCfgArray.globalCfg.maxGetPowerCount + GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.MonthCardFriendPowerAdd);
+            }
+        }
+
         private Dictionary<long, FriendInfoData> _friendDic = new Dictionary<long, FriendInfoData>();//好友列表
         private List<FriendInfoData> _list = new List<FriendInfoData>();
         public List<FriendInfoData> FriendDatas

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

@@ -115,7 +115,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetFriendGiftRed()
         {
-            if (FriendDataManager.Instance.Count >= GlobalCfgArray.globalCfg.maxGetPowerCount) return false;
+            if (FriendDataManager.Instance.Count >= FriendDataManager.Instance.maxGetPowerCount) return false;
 
             List<FriendInfoData> friendInfos = FriendDataManager.Instance.FriendDatas;
             for (int i = 0; i < friendInfos.Count; i++)

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

@@ -44,6 +44,14 @@ namespace GFGGame
             }
         }
 
+        public static int powerLimit
+        {
+            get
+            {
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.PowerLimit) + GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardPowerLimitAdd);
+            }
+        }
+
         public static long gold
         {
             get
@@ -186,7 +194,7 @@ namespace GFGGame
 
         public static bool CheckPowerFull()
         {
-            return RoleDataManager.power >= GameGlobal.myNumericComponent.GetAsInt(NumericType.PowerLimit);
+            return RoleDataManager.power >= powerLimit;
         }
 
         public static void InitServerData()
@@ -208,7 +216,7 @@ namespace GFGGame
             {
                 return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldEndTime);
             }
-            return false;
+            return true;
         }
         public static OtherRoleInfoData GetOtherRoleInfoData(OtherRoleInfoProto otherRoleInfo)
         {

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

@@ -162,47 +162,75 @@ namespace GFGGame
             // return giftBagCfgs;
             return null;
         }
-
-        public List<ShopCfg> SortGiftBagCfgs(List<ShopCfg> shopCfgs)
+        public List<ShopCfg> SortShopGoodsCfgs(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;
+                return a.id - b.id;
+            });
+            return shopCfgs;
+        }
+        public List<int> GetShopCostIds(List<ShopCfg> shopCfgs)
+        {
+            List<int> costIds = new List<int>();
+            for (int i = 0; i < shopCfgs.Count; i++)
+            {
+                if (shopCfgs[i].costId == 0) continue;
+                if (costIds.IndexOf(shopCfgs[i].costId) < 0)
+                {
+                    costIds.Add(shopCfgs[i].costId);
+                }
+            }
+            return costIds;
+        }
+        // public List<ShopCfg> SortGiftBagCfgs(List<ShopCfg> shopCfgs)
+        // {
+        //     shopCfgs.Sort((ShopCfg a, ShopCfg b) =>
+        //     {
 
-                //免费>钻石>现金>道具
-                if (a.costType < b.costType) return -1;
-                if (a.costType > b.costType) return 1;
+        //         //未售罄的＞未解锁>已售罄的
+        //         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 endTimeA = a.endTime != "" ? 1 : -1;
-                int endTimeB = b.endTime != "" ? 1 : -1;
-                if (endTimeA > endTimeB) return -1;
-                if (endTimeA < endTimeB) 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 disCountA - disCountB;
 
-                if (a.price != b.price) return a.price - b.price;
+        //         //折扣打的>折扣小的
+        //         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;
-        }
+
+        //         return 0;
+        //     });
+        //     return shopCfgs;
+        // }
         //获取商品折扣百分比
         public int GetShopGoodsDiscount(int goodsId)
         {
@@ -279,33 +307,39 @@ namespace GFGGame
         //     return shopExchangeCfgs;
         // }
         /// <summary>
-        /// 根据商品Id获取商品是否解锁解锁
+        /// 根据商品Id获取商品是否已解锁
         /// /// </summary>
         /// <param name="goodsId"></param>
         /// <returns></returns>
         public bool GetShopGoodsStateById(int goodsId)
         {
-            ShopCfg cfg = ShopCfgArray.Instance.GetCfg(goodsId);
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(goodsId);
 
-            if (cfg.lockType == LockType.NONE)
+            if (shopCfg.lockType == LockType.NONE)
             {
                 return true;
             }
-            else if (cfg.lockType == LockType.STORY_LV)
+            else if (shopCfg.lockType == LockType.STORY_LV)
             {
-                return InstanceZonesDataManager.CheckLevelPass(cfg.lockValue);
+                return InstanceZonesDataManager.CheckLevelPass(shopCfg.lockValue);
             }
-            else if (cfg.lockType == LockType.ROLE_LV)
+            else if (shopCfg.lockType == LockType.ROLE_LV)
             {
-                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= cfg.lockValue;
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= shopCfg.lockValue;
             }
-            else if (cfg.lockType == LockType.MONTH_CARD_TYPE)
+            else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE)
             {
-                return RoleDataManager.CheckIsMonthCardOpenByType(cfg.lockValue);
+                return RoleDataManager.CheckIsMonthCardOpenByType(shopCfg.lockValue);
             }
-            else if (cfg.lockType == LockType.AREND_GRADE)
+            else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
-                return ArenaDataManager.Instance.Grade >= cfg.lockValue;
+                int lockValue = shopCfg.lockValue;
+                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;
+                }
+                return ArenaDataManager.Instance.Grade >= lockValue;
             }
             return true;
         }
@@ -332,7 +366,15 @@ namespace GFGGame
             }
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
-                return string.Format("飞花令达到段位-{0}解锁", shopCfg.lockValue);
+                int lockValue = shopCfg.lockValue;
+                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;
+                }
+                ArenaRankCfg arenaRankCfg = ArenaRankCfgArray.Instance.GetCfg(lockValue);
+
+                return string.Format("飞花令段位达到{0}解锁", arenaRankCfg.gradeName);
             }
             return "";
         }

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

@@ -73,7 +73,7 @@ namespace GFGGame
                 item.m_btnBuy.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.originalPrice);
                 if (shopCfg.price > 0 && shopCfg.costType != CostType.FREE)//不免费
                 {
-                    item.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.originalPrice > 0;
+                    item.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.originalPrice > 0 && shopCfg.originalPrice != shopCfg.price;
                     item.m_btnBuy.m_loaIcon.visible = true;
                     item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.price);// cfg.price.ToString();
 
@@ -126,15 +126,16 @@ 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)
+            // 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();
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ButtonInValueBar
+    {
+        public GButton target;
+        public GImage m_imgAdd;
+        public const string URL = "ui://eg2y0ldpr9gf5z";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ButtonInValueBar";
+        private static UI_ButtonInValueBar _proxy;
+
+        public static UI_ButtonInValueBar Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonInValueBar();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonInValueBar Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonInValueBar();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_imgAdd = (GImage)comp.GetChild("imgAdd");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_imgAdd = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -8,17 +8,18 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_c1;
-        public GButton m_btnCJLuoXing;
-        public GButton m_btnCJHuoDong;
-        public GButton m_btnTravel;
-        public GButton m_btnGallery;
-        public GButton m_btnPower;
-        public GButton m_btnCJ;
-        public GButton m_btnGold;
-        public GButton m_btnDiamondRed;
-        public GButton m_btnDiamondPurple;
-        public GButton m_btnArena;
-        public GButton m_btnLeagueContribuation;
+        public UI_ButtonInValueBar m_btnCJLuoXing;
+        public UI_ButtonInValueBar m_btnCJHuoDong;
+        public UI_ButtonInValueBar m_btnTravel;
+        public UI_ButtonInValueBar m_btnGallery;
+        public UI_ButtonInValueBar m_btnPower;
+        public UI_ButtonInValueBar m_btnCJ;
+        public UI_ButtonInValueBar m_btnGold;
+        public UI_ButtonInValueBar m_btnDiamondRed;
+        public UI_ButtonInValueBar m_btnDiamondPurple;
+        public UI_ButtonInValueBar m_btnArena;
+        public UI_ButtonInValueBar m_btnLeagueContribuation;
+        public GList m_list;
         public const string URL = "ui://eg2y0ldpv3541v";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComponentValueBar";
@@ -67,32 +68,45 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_btnCJLuoXing = (GButton)comp.GetChild("btnCJLuoXing");
-            m_btnCJHuoDong = (GButton)comp.GetChild("btnCJHuoDong");
-            m_btnTravel = (GButton)comp.GetChild("btnTravel");
-            m_btnGallery = (GButton)comp.GetChild("btnGallery");
-            m_btnPower = (GButton)comp.GetChild("btnPower");
-            m_btnCJ = (GButton)comp.GetChild("btnCJ");
-            m_btnGold = (GButton)comp.GetChild("btnGold");
-            m_btnDiamondRed = (GButton)comp.GetChild("btnDiamondRed");
-            m_btnDiamondPurple = (GButton)comp.GetChild("btnDiamondPurple");
-            m_btnArena = (GButton)comp.GetChild("btnArena");
-            m_btnLeagueContribuation = (GButton)comp.GetChild("btnLeagueContribuation");
+            m_btnCJLuoXing = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnCJLuoXing"));
+            m_btnCJHuoDong = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnCJHuoDong"));
+            m_btnTravel = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnTravel"));
+            m_btnGallery = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnGallery"));
+            m_btnPower = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnPower"));
+            m_btnCJ = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnCJ"));
+            m_btnGold = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnGold"));
+            m_btnDiamondRed = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnDiamondRed"));
+            m_btnDiamondPurple = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnDiamondPurple"));
+            m_btnArena = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnArena"));
+            m_btnLeagueContribuation = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnLeagueContribuation"));
+            m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_btnCJLuoXing.Dispose();
             m_btnCJLuoXing = null;
+            m_btnCJHuoDong.Dispose();
             m_btnCJHuoDong = null;
+            m_btnTravel.Dispose();
             m_btnTravel = null;
+            m_btnGallery.Dispose();
             m_btnGallery = null;
+            m_btnPower.Dispose();
             m_btnPower = null;
+            m_btnCJ.Dispose();
             m_btnCJ = null;
+            m_btnGold.Dispose();
             m_btnGold = null;
+            m_btnDiamondRed.Dispose();
             m_btnDiamondRed = null;
+            m_btnDiamondPurple.Dispose();
             m_btnDiamondPurple = null;
+            m_btnArena.Dispose();
             m_btnArena = null;
+            m_btnLeagueContribuation.Dispose();
             m_btnLeagueContribuation = null;
+            m_list = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -22,6 +22,7 @@ namespace UI.CommonGame
         public GTextField m_txtCostCount;
         public GTextField m_txtTips;
         public UI_ComCostCurrency m_comCost;
+        public GTextField m_txtRmbCost;
         public GButton m_btnCancle;
         public GButton m_btnConfirm;
         public const string URL = "ui://eg2y0ldps5s9tik";
@@ -86,6 +87,7 @@ namespace UI.CommonGame
             m_txtCostCount = (GTextField)comp.GetChild("txtCostCount");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_comCost = (UI_ComCostCurrency)UI_ComCostCurrency.Create(comp.GetChild("comCost"));
+            m_txtRmbCost = (GTextField)comp.GetChild("txtRmbCost");
             m_btnCancle = (GButton)comp.GetChild("btnCancle");
             m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
         }
@@ -110,6 +112,7 @@ namespace UI.CommonGame
             m_txtTips = null;
             m_comCost.Dispose();
             m_comCost = null;
+            m_txtRmbCost = null;
             m_btnCancle = null;
             m_btnConfirm = null;
             if(disposeTarget && target != null)

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

@@ -16,7 +16,7 @@ namespace UI.League
         public UI_Button14 m_btnRecruit;
         public GButton m_btnApplyList;
         public GButton m_btnMemberLog;
-        public GComponent m_btnExit;
+        public GButton m_btnExit;
         public GButton m_btnExit1;
         public const string URL = "ui://tw70qm9du2u35";
         public const string PACKAGE_NAME = "League";
@@ -74,7 +74,7 @@ namespace UI.League
             m_btnRecruit = (UI_Button14)UI_Button14.Create(comp.GetChild("btnRecruit"));
             m_btnApplyList = (GButton)comp.GetChild("btnApplyList");
             m_btnMemberLog = (GButton)comp.GetChild("btnMemberLog");
-            m_btnExit = (GComponent)comp.GetChild("btnExit");
+            m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnExit1 = (GButton)comp.GetChild("btnExit1");
         }
         public void Dispose(bool disposeTarget = false)

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

@@ -14,6 +14,8 @@ namespace UI.League
         public GList m_listGift;
         public GTextField m_txtTime;
         public GLoader m_loaType;
+        public GTextField m_txtLock;
+        public GGroup m_grpLock;
         public const string URL = "ui://tw70qm9d9jv678";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListGiftButItem";
@@ -68,6 +70,8 @@ namespace UI.League
             m_listGift = (GList)comp.GetChild("listGift");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_loaType = (GLoader)comp.GetChild("loaType");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +82,8 @@ namespace UI.League
             m_listGift = null;
             m_txtTime = null;
             m_loaType = null;
+            m_txtLock = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -16,8 +16,8 @@ namespace UI.Store
         public GTextField m_txtName;
         public GTextField m_txtEndTime;
         public GTextField m_txtLimit;
-        public GTextField m_txtLock;
         public UI_Button5 m_btnBuy;
+        public GTextField m_txtLock;
         public const string URL = "ui://p9mtgheo10not1t";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ListGiftItem";
@@ -74,8 +74,8 @@ namespace UI.Store
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
             m_txtLimit = (GTextField)comp.GetChild("txtLimit");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
             m_btnBuy = (UI_Button5)UI_Button5.Create(comp.GetChild("btnBuy"));
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -88,9 +88,9 @@ namespace UI.Store
             m_txtName = null;
             m_txtEndTime = null;
             m_txtLimit = null;
-            m_txtLock = null;
             m_btnBuy.Dispose();
             m_btnBuy = null;
+            m_txtLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -16,8 +16,8 @@ namespace UI.Store
         public GTextField m_txtName;
         public GTextField m_txtEndTime;
         public GTextField m_txtLimit;
-        public GTextField m_txtLock;
         public UI_Button5 m_btnBuy;
+        public GTextField m_txtLock;
         public const string URL = "ui://p9mtgheol500tbe";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ListShopItem";
@@ -74,8 +74,8 @@ namespace UI.Store
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
             m_txtLimit = (GTextField)comp.GetChild("txtLimit");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
             m_btnBuy = (UI_Button5)UI_Button5.Create(comp.GetChild("btnBuy"));
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -88,9 +88,9 @@ namespace UI.Store
             m_txtName = null;
             m_txtEndTime = null;
             m_txtLimit = null;
-            m_txtLock = null;
             m_btnBuy.Dispose();
             m_btnBuy = null;
+            m_txtLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.Store
     public partial class UI_StoreChargeAddUpUI
     {
         public GComponent target;
+        public GComponent m_valueBar;
         public UI_ComVipLv m_comVipLv;
         public GList m_list;
         public const string URL = "ui://p9mtgheol500tbf";
@@ -56,11 +57,13 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_comVipLv = (UI_ComVipLv)UI_ComVipLv.Create(comp.GetChild("comVipLv"));
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_valueBar = null;
             m_comVipLv.Dispose();
             m_comVipLv = null;
             m_list = null;

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

@@ -7,6 +7,7 @@ namespace UI.Store
     public partial class UI_StoreChargeUI
     {
         public GComponent target;
+        public GComponent m_valueBar;
         public UI_ComVipLv m_comVipLv;
         public GList m_list;
         public const string URL = "ui://p9mtgheol500tb9";
@@ -56,11 +57,13 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_comVipLv = (UI_ComVipLv)UI_ComVipLv.Create(comp.GetChild("comVipLv"));
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_valueBar = null;
             m_comVipLv.Dispose();
             m_comVipLv = null;
             m_list = null;

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

@@ -8,6 +8,7 @@ namespace UI.Store
     {
         public GComponent target;
         public GList m_list;
+        public GComponent m_valueBar;
         public const string URL = "ui://p9mtgheol500tbh";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreExchangeUI";
@@ -56,10 +57,12 @@ namespace UI.Store
         private void Init(GComponent comp)
         {
             m_list = (GList)comp.GetChild("list");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_list = null;
+            m_valueBar = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,6 +8,7 @@ namespace UI.Store
     {
         public GComponent target;
         public GList m_list;
+        public GComponent m_valueBar;
         public const string URL = "ui://p9mtgheol500tbc";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreGiftBagUI";
@@ -56,10 +57,12 @@ namespace UI.Store
         private void Init(GComponent comp)
         {
             m_list = (GList)comp.GetChild("list");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_list = null;
+            m_valueBar = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,7 +8,6 @@ namespace UI.Store
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GComponent m_valueBar;
         public GButton m_btnBack;
         public UI_ComTab m_comTab;
         public GList m_listSubTab;
@@ -60,7 +59,6 @@ namespace UI.Store
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_comTab = (UI_ComTab)UI_ComTab.Create(comp.GetChild("comTab"));
             m_listSubTab = (GList)comp.GetChild("listSubTab");
@@ -68,7 +66,6 @@ namespace UI.Store
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_valueBar = null;
             m_btnBack = null;
             m_comTab.Dispose();
             m_comTab = null;

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

@@ -361,10 +361,6 @@ namespace GFGGame
             arenaTarget.FightScores = arenaTargetProto.FightPower;
             if (arenaTarget.Type == FightTargetType.PLAYER)
             {
-                // arenaTarget.RoleInfo.roleId = arenaTargetProto.RoleInfo.RoleId;
-                // arenaTarget.RoleInfo.roleName = arenaTargetProto.RoleInfo.RoleName;
-                // arenaTarget.RoleInfo.roleLv = arenaTargetProto.RoleInfo.RoleLvl;
-                // arenaTarget.RoleInfo.headId = arenaTargetProto.RoleInfo.HeadItemId;
                 arenaTarget.RoleInfo = RoleDataManager.GetOtherRoleInfoData(arenaTargetProto.RoleInfo);
             }
             else
@@ -424,14 +420,16 @@ namespace GFGGame
                 fightData.tagAddition = robotCfg.tagAddition;
             }
             fightData.itemScoreList.Clear();
+            double randoms = robotProto.Randoms.Count >= robotCfg.partsScoreArr.Length ? (double)robotProto.Randoms[index] / 10000d : 1;
+
             for (int i = 0; i < robotCfg.partsScoreArr.Length; i++)
             {
-                double score = (double)robotCfg.partsScoreArr[i] * (double)robotProto.Randoms[index] / 10000d;
+                double score = (double)robotCfg.partsScoreArr[i] * randoms;
                 fightData.itemScoreList.Add((int)Math.Ceiling(score));
             }
             fightData.type = FightTargetType.ROBOT;
             fightData.res = string.IsNullOrEmpty(robotProto.RobotHead) ? "self" : robotProto.RobotHead;
-            double cardScore = (double)robotCfg.cardScore * (double)robotProto.Randoms[index] / 10000d;
+            double cardScore = (double)robotCfg.cardScore * randoms;
             fightData.cardScore = (int)Math.Ceiling(cardScore);
             fightData.skillLvs.Add(robotCfg.skillLvs);
             fightData.showSuitId = robotProto.SuitList.Count <= index ? 0 : robotProto.SuitList[index];//上赛季没有穿戴数据

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

@@ -249,7 +249,7 @@ namespace GFGGame
                     {
                         FriendDataManager.Instance.ChangeGiveTakeGiftStates(response.FriendIds[i], response.GiveGiftStates[i], response.TakeGiftStates[i]);
                     }
-                    if (FriendDataManager.Instance.Count >= GlobalCfgArray.globalCfg.maxGetPowerCount)
+                    if (FriendDataManager.Instance.Count >= FriendDataManager.Instance.maxGetPowerCount)
                     {
                         PromptController.Instance.ShowFloatTextPrompt("今日体力已全部领取");
                     }

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

@@ -63,7 +63,7 @@ namespace GFGGame
             item.m_txtTargetName.text = historyData.targetData.RoleInfo.roleName;
             item.m_txtRank.text = historyData.targetData.RankInGrade.ToString();
 
-            item.m_txtTargetFightScore.text = string.Format("竞技场战力：{0}", ArenaDataManager.Instance.GetAllFightScore(historyData.targetData.FightScores));
+            item.m_txtTargetFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(historyData.targetData.FightScores));
             ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, historyData.targetData.Grade);
             TimeUtil.FormattingTime(historyData.FightTime, TimeHelper.ServerNow(), out int num, out string str);
             str = str == "秒" ? "刚刚" : num + str + "前";

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

@@ -228,7 +228,7 @@ namespace GFGGame
             if (arenaData == null)
             {
                 item.m_txtName.text = "--";
-                item.m_txtFightScore.text = "竞技场战力：--";
+                item.m_txtFightScore.text = "飞花令战力：--";
                 item.m_txtDanRank.text = "段位排名：--";
                 // item.m_loaDanIcon.url = "";
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, 0);
@@ -242,16 +242,16 @@ namespace GFGGame
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
                     //上榜的玩家一定战斗过，可以直接计算
-                    item.m_txtFightScore.text = string.Format("竞技场战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
+                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
                     RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
                 }
                 else
                 {
-                    //上榜的机器人不一定战斗过，所以不一定有竞技场战力数据，所以机器人需要重新计算
-                    item.m_txtFightScore.text = string.Format("竞技场战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightDatas));
+                    //上榜的机器人不一定战斗过，所以不一定有飞花令战力数据，所以机器人需要重新计算
+                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightDatas));
                     RoleInfoManager.Instance.UpdateNpcHead(item.m_comHead, arenaData.RoleInfo.headRes);
                 }
-                // item.m_txtFightScore.text = string.Format("竞技场战力：{0}", fightScore);
+                // item.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
                 item.m_txtDanRank.text = string.Format("段位排名：{0}", arenaData.Grade);
                 ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, arenaData.Grade);
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
@@ -283,7 +283,7 @@ namespace GFGGame
             {
                 item.m_txtRank.text = "--";
                 item.m_txtName.text = "--";
-                item.m_txtFightScore.text = "竞技场战力：--";
+                item.m_txtFightScore.text = "飞花令战力：--";
                 item.m_txtDanRank.text = "--";
                 // item.m_loaDanIcon.url = "";
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, 0);
@@ -301,13 +301,13 @@ namespace GFGGame
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
                     //上榜的玩家一定战斗过，可以直接计算
-                    item.m_txtFightScore.text = string.Format("竞技场战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
+                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
                     RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
                 }
                 else
                 {
-                    //上榜的机器人不一定战斗过，所以不一定有竞技场战力数据，所以机器人需要重新计算
-                    item.m_txtFightScore.text = string.Format("竞技场战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightDatas));
+                    //上榜的机器人不一定战斗过，所以不一定有飞花令战力数据，所以机器人需要重新计算
+                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightDatas));
                     RoleInfoManager.Instance.UpdateNpcHead(item.m_comHead, arenaData.RoleInfo.headRes);
                 }
             }

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

@@ -154,7 +154,7 @@ namespace GFGGame
         }
         private void OnBtnShopClick()
         {
-            ViewManager.Show<StoreView>();
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_ARENA, ConstStoreSubId.STORE_ARENA_ITEM }, new object[] { typeof(ArenaView).FullName, this.viewData });
         }
         private void OnBtnRewardClick()
         {
@@ -181,7 +181,7 @@ namespace GFGGame
                 return;
             }
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.costIdBuyFightTimes);
-            AlertUI.Show(string.Format("是否使用{0}{1}增加1次竞技场挑战次数？", GlobalCfgArray.globalCfg.costNumBuyFightTimes, itemCfg.name),
+            AlertUI.Show(string.Format("是否使用{0}{1}增加1次飞花令挑战次数？", GlobalCfgArray.globalCfg.costNumBuyFightTimes, itemCfg.name),
             string.Format("(今天已购买{0}/{1}次)", GlobalCfgArray.globalCfg.limitDailyBuyFightTimes - RoleDataManager.ArenaBuyFightTimes, GlobalCfgArray.globalCfg.limitDailyBuyFightTimes))
             .SetLeftButton(true, "取消").SetRightButton(true, "确定", (object data) =>
             {
@@ -326,7 +326,7 @@ namespace GFGGame
             _ui.m_txtRank.text = string.Format("段位排名：{0}", _dataManager.Rank);
             _ui.m_txtDanTitle.text = ArenaRankCfgArray.Instance.GetCfg(_dataManager.Grade).gradeName;
             long fightScore = _dataManager.GetAllFightScore(_dataManager.DressupList);
-            _ui.m_txtFightScore.text = string.Format("竞技场战力：{0}", fightScore);
+            _ui.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
             _ui.m_btnQuickFight.selected = _dataManager.QuickFight;
             ArenaViewManager.Instance.UpdateFightScore(_ui.m_comFightScore.target, _dataManager.DressupList);
         }
@@ -335,7 +335,7 @@ namespace GFGGame
         private void UpdateValue()
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.bonusSpecialWinArr[0][0]);
-            _ui.m_txtMoneyCount.text = string.Format("今日还可获得{0}次{1}货币", RoleDataManager.ArenaTimesBonusSpecial, itemCfg.name);
+            _ui.m_txtMoneyCount.text = string.Format("今日还可获得{0}次{1}", RoleDataManager.ArenaTimesBonusSpecial, itemCfg.name);
             _ui.m_txtFightCount.text = string.Format("剩余次数：{0}/{1}", RoleDataManager.ArenaFightTimes, GlobalCfgArray.globalCfg.fightTimesLimit);
             if (RoleDataManager.ArenaFreshTimes > 0)
             {
@@ -403,7 +403,7 @@ namespace GFGGame
             item.m_comLv.GetChild("txtLvl").asTextField.text = targetData.RoleInfo.roleLv.ToString();
 
             long fightScore = _dataManager.GetAllFightScore(targetData.FightDatas);
-            item.m_txtFightScore.text = string.Format("竞技场战力:{0}", fightScore);
+            item.m_txtFightScore.text = string.Format("飞花令战力:{0}", fightScore);
             item.m_txtRank.text = string.Format("段位排名:{0}", targetData.RankInGrade);
             item.m_imgUpDan.visible = targetData.Grade > ArenaDataManager.Instance.Grade;
             if (item.m_loaBg.data == null)

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

@@ -1,6 +1,7 @@
 using UI.CommonGame;
 using FairyGUI;
 using ET;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
@@ -11,65 +12,47 @@ namespace GFGGame
         public ValueBarController(GComponent valueBar, int ctrlSelected = 0)
         {
             _valueBar = UI_ComponentValueBar.Create(valueBar);
-            // _valueBar.m_c1.selectedIndex = ctrlSelected;
-            // _valueBar.target.x = 370;
-            _valueBar.m_btnGold.onClick.Add(() =>
-            {
-
-                ItemUtil.AddGold();
-            });
-            _valueBar.m_btnPower.onClick.Add(() =>
-            {
-
-                ItemUtil.AddPower();
-            });
-            _valueBar.m_btnDiamondPurple.onClick.Add(() =>
-            {
-
-                ItemUtil.AddDiamondPurple();
-            });
-            _valueBar.m_btnDiamondRed.onClick.Add(() =>
-            {
 
-                ItemUtil.AddDiamondRed();
-            });
-            _valueBar.m_btnCJLuoXing.onClick.Add(() =>
-            {
-
-                ViewManager.Show<LuckyBoxView>(LuckyBoxDataManager.BOX_ID_2, new object[] { typeof(ClothingShopView).FullName, new object[] { LuckyBoxDataManager.BOX_ID_2 } });
-
-            });
-            _valueBar.m_btnCJHuoDong.onClick.Add(() =>
-            {
+            _valueBar.m_btnGold.target.onClick.Add(OnClickGold);
+            _valueBar.m_btnPower.target.onClick.Add(OnClickPower);
+            _valueBar.m_btnDiamondPurple.target.onClick.Add(OnClickDiamondPurple);
+            _valueBar.m_btnDiamondRed.target.onClick.Add(OnClickDiamondRed);
 
-                ViewManager.Show<LuckyBoxView>(LuckyBoxDataManager.BOX_ID_1, new object[] { typeof(ClothingShopView).FullName, new object[] { LuckyBoxDataManager.BOX_ID_1 } });
-
-            });
-
-            _valueBar.m_btnCJ.onClick.Add((EventCallback0)(() =>
-            {
-                int luckyBoxId = LuckyBoxDataManager.Instance.currentBoxId;
-                LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
-
-                ItemUtil.ExchangeItemById(luckyBoxCfg.costID, 1, true);
-
-            }));
-            _valueBar.m_btnTravel.onClick.Add(() =>
-            {
-                object[] sourceDatas = new object[] { GlobalCfgArray.globalCfg.travelCostArr[0], new object[] { typeof(TravelView).FullName, null } };
-                GoodsItemTipsController.ShowItemTips(GlobalCfgArray.globalCfg.travelCostArr[0], sourceDatas);
-            });
-            _valueBar.m_btnGallery.onClick.Add(() =>
-            {
-                ViewManager.Show<PoemGalleryRuleView>();
-            });
-            _valueBar.m_btnLeagueContribuation.onClick.Add(() =>
-            {
-                object[] sourceDatas = new object[] { ConstItemID.LEAGUE_CONTRIBUTION, new object[] { typeof(LeagueSkillUpView).FullName, null } };
-                GoodsItemTipsController.ShowItemTips(ConstItemID.LEAGUE_CONTRIBUTION, sourceDatas);
-            });
+            _valueBar.m_btnTravel.target.onClick.Add(OnClickTravel);
+            _valueBar.m_btnGallery.target.onClick.Add(OnClickGallery);
+            _valueBar.m_btnLeagueContribuation.target.onClick.Add(OnClickLeagueContribuation);
 
         }
+        private void OnClickGold()
+        {
+            ItemUtil.AddGold();
+        }
+        private void OnClickPower()
+        {
+            ItemUtil.AddPower();
+        }
+        private void OnClickDiamondPurple()
+        {
+            ItemUtil.AddDiamondPurple();
+        }
+        private void OnClickDiamondRed()
+        {
+            ItemUtil.AddDiamondRed();
+        }
+        private void OnClickTravel()
+        {
+            object[] sourceDatas = new object[] { GlobalCfgArray.globalCfg.travelCostArr[0], new object[] { typeof(TravelView).FullName, null } };
+            GoodsItemTipsController.ShowItemTips(GlobalCfgArray.globalCfg.travelCostArr[0], sourceDatas);
+        }
+        private void OnClickGallery()
+        {
+            ViewManager.Show<PoemGalleryRuleView>();
+        }
+        private void OnClickLeagueContribuation()
+        {
+            object[] sourceDatas = new object[] { ConstItemID.LEAGUE_CONTRIBUTION, new object[] { typeof(LeagueSkillUpView).FullName, null } };
+            GoodsItemTipsController.ShowItemTips(ConstItemID.LEAGUE_CONTRIBUTION, sourceDatas);
+        }
 
         public void Dispose()
         {
@@ -109,62 +92,139 @@ namespace GFGGame
             UpdateGallery();
             UpdateArena();
             UpdateLeagueContribution();
+            _valueBar.m_list.numItems = _valueBar.m_list.numItems;
         }
         private void UpdateCurrency()
         {
-            _valueBar.m_btnGold.text = "" + RoleDataManager.gold;
-            _valueBar.m_btnDiamondPurple.text = "" + RoleDataManager.diaP;
-            _valueBar.m_btnDiamondRed.text = "" + RoleDataManager.diaR;
+            _valueBar.m_btnGold.target.text = "" + RoleDataManager.gold;
+            _valueBar.m_btnDiamondPurple.target.text = "" + RoleDataManager.diaP;
+            _valueBar.m_btnDiamondRed.target.text = "" + RoleDataManager.diaR;
         }
         private void UpdateNumeric()
         {
-            _valueBar.m_btnPower.text = string.Format("{0}/{1}", RoleDataManager.power, GameGlobal.myNumericComponent.GetAsInt(NumericType.PowerLimit));
+            _valueBar.m_btnPower.target.text = string.Format("{0}/{1}", RoleDataManager.power, RoleDataManager.powerLimit);
         }
 
         //ժ�ǣ��齱���һ�
         private void UpdateCJExchange()
         {
-            _valueBar.m_btnCJLuoXing.text = "" + ItemDataManager.GetItemNum(ConstItemID.LUCKYBOX_STORE_COST);
-            _valueBar.m_btnCJLuoXing.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.LUCKYBOX_STORE_COST).res);
+            _valueBar.m_btnCJLuoXing.target.text = "" + ItemDataManager.GetItemNum(ConstItemID.LUCKYBOX_STORE_COST);
+            _valueBar.m_btnCJLuoXing.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.LUCKYBOX_STORE_COST).res);
         }
         private void UpdateCJAExchange()
         {
-            _valueBar.m_btnCJHuoDong.text = "" + ItemDataManager.GetItemNum(ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST);
-            _valueBar.m_btnCJHuoDong.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST).res);
+            _valueBar.m_btnCJHuoDong.target.text = "" + ItemDataManager.GetItemNum(ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST);
+            _valueBar.m_btnCJHuoDong.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST).res);
         }
 
         public void UpdateCJ()
         {
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId);
             if (luckyBoxCfg == null) return;
-            _valueBar.m_btnCJ.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg.costID);
-            _valueBar.m_btnCJ.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
+            _valueBar.m_btnCJ.target.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg.costID);
+            _valueBar.m_btnCJ.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
         }
 
         private void UpdateTravel()
         {
             int itemId = GlobalCfgArray.globalCfg.travelCostArr[0];
-            _valueBar.m_btnTravel.text = "" + ItemDataManager.GetItemNum(itemId);
-            _valueBar.m_btnTravel.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(itemId).res);
+            _valueBar.m_btnTravel.target.text = "" + ItemDataManager.GetItemNum(itemId);
+            _valueBar.m_btnTravel.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(itemId).res);
 
         }
 
         private void UpdateGallery()
         {
-            _valueBar.m_btnGallery.text = "" + ItemDataManager.GetItemNum(ConstItemID.GALLERY_STORE_COST);
-            _valueBar.m_btnGallery.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.GALLERY_STORE_COST).res);
+            _valueBar.m_btnGallery.target.text = "" + ItemDataManager.GetItemNum(ConstItemID.GALLERY_STORE_COST);
+            _valueBar.m_btnGallery.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.GALLERY_STORE_COST).res);
         }
         private void UpdateArena()
         {
-            _valueBar.m_btnArena.GetChild("n3").asImage.visible = false;
-            _valueBar.m_btnArena.text = "" + ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.bonusSpecialWinArr[0][0]);
-            _valueBar.m_btnArena.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.bonusSpecialWinArr[0][0]).res);
+            _valueBar.m_btnArena.m_imgAdd.visible = false;
+            _valueBar.m_btnArena.target.text = "" + ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.bonusSpecialWinArr[0][0]);
+            _valueBar.m_btnArena.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.bonusSpecialWinArr[0][0]).res);
         }
         private void UpdateLeagueContribution()
         {
-            _valueBar.m_btnLeagueContribuation.GetChild("n3").asImage.visible = false;
-            _valueBar.m_btnLeagueContribuation.text = "" + ItemDataManager.GetItemNum(ConstItemID.LEAGUE_CONTRIBUTION);
-            _valueBar.m_btnLeagueContribuation.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.LEAGUE_CONTRIBUTION).res);
+            _valueBar.m_btnLeagueContribuation.target.text = "" + ItemDataManager.GetItemNum(ConstItemID.LEAGUE_CONTRIBUTION);
+            _valueBar.m_btnLeagueContribuation.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.LEAGUE_CONTRIBUTION).res);
+        }
+
+        public void UpdateList(List<int> itemIds)
+        {
+            itemIds.Sort((x, y) => -x.CompareTo(y));
+            if (_valueBar.m_list.data == null)
+            {
+                _valueBar.m_list.itemRenderer = RenderListItem;
+            }
+            _valueBar.m_list.data = itemIds;
+            _valueBar.m_list.numItems = itemIds.Count;
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            int itemId = (obj.parent.data as List<int>)[index];
+            UpdateButton(obj, itemId);
+        }
+        private void UpdateButton(GObject obj, int itemId)
+        {
+            UI_ButtonInValueBar button = UI_ButtonInValueBar.Proxy(obj);
+            button.target.text = "" + ItemDataManager.GetItemNum(itemId);
+            button.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(itemId).res);
+            switch (itemId)
+            {
+                case ConstItemID.GOLD:
+                case ConstItemID.POWER:
+                case ConstItemID.DIAMOND_PURPLE:
+                case ConstItemID.DIAMOND_RED:
+                case ConstItemID.TRAVEL:
+                case ConstItemID.GALLERY_STORE_COST:
+                case ConstItemID.LEAGUE_CONTRIBUTION:
+                    button.m_imgAdd.visible = true;
+                    break;
+                default:
+                    button.m_imgAdd.visible = false;
+                    break;
+            }
+            if (button.target.data == null)
+            {
+                button.target.onClick.Add(OnBtnClick);
+            }
+            button.target.data = itemId;
+            UI_ButtonInValueBar.ProxyEnd();
+        }
+
+        private void OnBtnClick(EventContext context)
+        {
+            int itemId = (int)(context.sender as GObject).data;
+            OnBtnClick(itemId);
+        }
+        private void OnBtnClick(int itemId)
+        {
+            switch (itemId)
+            {
+                case ConstItemID.GOLD:
+                    OnClickGold();
+                    break;
+                case ConstItemID.POWER:
+                    OnClickPower();
+                    break;
+                case ConstItemID.DIAMOND_PURPLE:
+                    OnClickDiamondPurple();
+                    break;
+                case ConstItemID.DIAMOND_RED:
+                    OnClickDiamondRed();
+                    break;
+                case ConstItemID.TRAVEL:
+                    OnClickGold();
+                    break;
+                case ConstItemID.GALLERY_STORE_COST:
+                    OnClickGallery();
+                    break;
+                case ConstItemID.LEAGUE_CONTRIBUTION:
+                    OnClickLeagueContribuation();
+                    break;
+            }
         }
     }
 }

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

@@ -190,7 +190,7 @@ namespace GFGGame
 
         private void OnBtnSendAllClick()
         {
-            if (RedDotDataManager.Instance.GetFriendGiftRed() && FriendDataManager.Instance.Count < GlobalCfgArray.globalCfg.maxGetPowerCount)
+            if (RedDotDataManager.Instance.GetFriendGiftRed() && FriendDataManager.Instance.Count < FriendDataManager.Instance.maxGetPowerCount)
             {
                 FriendSProxy.ReqTakeGiftFromAllFriend().Coroutine();
             }

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

@@ -1,9 +1,8 @@
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using ET;
 using FairyGUI;
 using UI.League;
-using UnityEngine;
+
 
 namespace GFGGame
 {
@@ -119,11 +118,11 @@ namespace GFGGame
             string strCount = buyData.GiftCfg.limitType == 1 ? "今日剩余：{0}/{1}" : "本周剩余：{0}/{1}";
             item.m_comItem.m_txtCount.text = string.Format(strCount, buyData.GiftCfg.limit - buyData.BuyCount, buyData.GiftCfg.limit);
             long day = TimeUtil.FormattingTime11(TimeHelper.ServerNow(), buyData.EndTime);
-            // long day = buyData.EndTime / TimeUtil.SECOND_PER_DAY / 1000;// TimeUtil.FormattingTime11(TimeHelper.ServerNow(), TimeHelper.ServerNow() + buyData.EndTime);
-            // item.m_txtTime.text = buyData.EndTime == 0 ? "" : string.Format("（剩余{0}天）", day);
             item.m_comItem.m_loaType.url = string.Format("ui://League/lm_biaoqian_{0}", _buyDatas[index].GiftCfg.type);
             item.m_comItem.m_txtTime.visible = buyData.EndTime != 0;
             item.m_comItem.m_txtTime.text = string.Format("剩余{0}天", StringUtil.GetColorText(day.ToString(), "#E45E29"));
+            item.m_comItem.m_grpLock.visible = LeagueDataManager.Instance.HallLevel < buyData.GiftCfg.level;
+            item.m_comItem.m_txtLock.text = string.Format("宴客厅等级达到{0}级解锁", buyData.GiftCfg.level);
             ItemUtil.UpdateItemNeedNum(item.m_comItem.m_comCost, buyData.GiftCfg.consumeArr[0]);
 
             if (item.m_comItem.m_listGift.data == null)

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

@@ -84,7 +84,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("消耗不足");
                 return;
             }
-            string tips = string.Format("是否花费{0}货币发布24小时招募成员信息，并临时增加新加入成员上限?", itemCfg.name);
+            string tips = string.Format("是否花费{0}*{1}发布24小时招募成员信息，并临时增加新加入成员上限?", itemCfg.name, needCount);
             AlertUI.Show(tips).
             SetLeftButton(true, "取消").
              SetRightButton(true, "确认", async (object param) =>
@@ -176,7 +176,7 @@ namespace GFGGame
         }
         private void OnUpdateTimer(object param)
         {
-            int timeCount = (int)(LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.AdEndTime) - TimeHelper.ServerNow()) / 1000;
+            int timeCount = (int)(LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.AdEndTime) - TimeHelper.ServerNow());
             if (timeCount <= 0)
             {
                 _ui.m_btnRecruit.target.touchable = true;
@@ -184,7 +184,7 @@ namespace GFGGame
                 // _ui.m_btnRecruit.m_txtTime.text = "";
                 Timers.inst.Remove(OnUpdateTimer);
             }
-            string time = TimeUtil.FormattingTime6(timeCount);
+            string time = TimeUtil.FormattingTime5(timeCount);
             _ui.m_btnRecruit.m_txtTime.text = string.Format("剩余时间: {0}", time);
         }
         private void UpdateLeader(GObject obj, long roleId)

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

@@ -53,6 +53,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
         protected override void OnShown()
         {
@@ -61,18 +62,7 @@ namespace GFGGame
             _valueBarController.OnShown();
             _valueBarController.Controller(11);
             _ui.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
-            if (LeagueDataManager.Instance.GetSkillProgressByType(_type) < 100 && LeagueDataManager.Instance.GetSkillProgressByType(_type) > 0)
-            {
-                if (LeagueDataManager.Instance.CurLayer == _ui.m_list.numItems)
-                {
-                    _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
-                }
-                else
-                {
-                    _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer);
-                }
-            }
-            // _pageCount = Math.Ceiling((double)(_ui.m_list.scrollPane.contentWidth / _ui.m_list.scrollPane.viewWidth));
+
             UpdateView();
         }
 
@@ -86,6 +76,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
 
         private void OnBtnBackClick()
@@ -114,14 +105,40 @@ namespace GFGGame
         }
         private void UpdateView()
         {
+            if (LeagueDataManager.Instance.GetSkillProgressByType(_type) < 100 && LeagueDataManager.Instance.GetSkillProgressByType(_type) > 0)
+            {
+                if (LeagueDataManager.Instance.CurLayer == _ui.m_list.numItems)
+                {
+                    _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
+                }
+                else
+                {
+                    bool isActive = true;
+                    List<LeagueSkillCfg> skillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, LeagueDataManager.Instance.CurLayer);
+                    for (int i = 0; i < skillCfgs.Count; i++)
+                    {
+                        if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[i].id) < 0)
+                        {
+                            isActive = false;
+                            break;
+                        }
+                    }
+                    if (isActive)
+                    {
+                        _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer);
+                    }
+                    else
+                    {
+                        _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
+                    }
+                }
+                // _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
+            }
             _ui.m_listScore.numItems = 4;
             _ui.m_list.RefreshVirtualList();
             _ui.m_txtTitle.text = "茶艺-" + LeagueSkillCountCfgArray.Instance.GetCfg(_type).name;
-            // UI_ListSkillTypeItem item = UI_ListSkillTypeItem.Proxy(_ui.m_comSkillType.target);
             double progress = LeagueDataManager.Instance.GetSkillProgressByType(_type);
-            // _ui.m_txtProgress.text = string.Format("进度{0}%", progress);
             _ui.m_txtProgress.SetVar("value", progress.ToString()).FlushVars();
-            // UI_ListSkillTypeItem.ProxyEnd();
         }
         private void RenderListScoreItem(int index, GObject obj)
         {

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

@@ -93,6 +93,11 @@ namespace GFGGame
         {
             ViewManager.Show<LeaguePrayView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
+        private void OnBtnShopClick()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_LEAGUE }, new object[] { typeof(LeaguePrayView).FullName, true }, true);
+            ViewManager.Show<LeaguePrayView>(null, new object[] { typeof(LeagueView).FullName, null });
+        }
         private void OnBtnSkillClick()
         {
             ViewManager.Show<LeagueSkillView>(null, new object[] { typeof(LeagueView).FullName, 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<GalleryShopView>(new object[] { ConstStoreId.GALLERY_STORE_ID }, 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 }, true);
         }
 
         /// <summary>

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

@@ -114,14 +114,26 @@ namespace GFGGame
             _ui.m_btnMinus.m_c1.selectedIndex = _buyCount == 1 ? 1 : 0;
             _ui.m_btnMinus.target.touchable = _buyCount == 1 ? false : true;
             // int hasCount = ItemDataManager.GetItemNum(cfg.itemId);
-            _ui.m_btnAdd.m_c1.selectedIndex = _buyCount == _maxCanBuy ? 1 : 0;
-            _ui.m_btnAdd.target.touchable = _buyCount == _maxCanBuy ? false : true;
-            _ui.m_btnMax.m_c1.selectedIndex = _buyCount == _maxCanBuy ? 1 : 0;
-            _ui.m_btnMax.target.touchable = _buyCount == _maxCanBuy ? false : true;
+            _ui.m_btnAdd.m_c1.selectedIndex = _shopCfg.costType == CostType.RMB || _buyCount == _maxCanBuy ? 1 : 0;
+            _ui.m_btnAdd.target.touchable = _shopCfg.costType == CostType.RMB || _buyCount == _maxCanBuy ? false : true;
+            _ui.m_btnMax.m_c1.selectedIndex = _shopCfg.costType == CostType.RMB || _buyCount == _maxCanBuy ? 1 : 0;
+            _ui.m_btnMax.target.touchable = _shopCfg.costType == CostType.RMB || _buyCount == _maxCanBuy ? false : true;
 
             _ui.m_txtShow.text = "选择购买数量";
             _ui.m_txtTips.text = string.Format("确定购买{0}个{1}？", _buyCount, itemCfg.name);
-            ItemUtil.UpdateItemNeedNum(_ui.m_comCost.target, _shopCfg.costId, (int)_buyCount * _shopCfg.price);
+            if (_shopCfg.costType == CostType.RMB)
+            {
+                _ui.m_comCost.target.visible = false;
+                _ui.m_txtRmbCost.visible = true;
+                _ui.m_txtRmbCost.text = string.Format("￥ {0}", _shopCfg.price);
+                // _ui.m_txtRmbCost.SetVar("value", _shopCfg.price.ToString()).FlushVars();
+            }
+            else
+            {
+                _ui.m_comCost.target.visible = true;
+                _ui.m_txtRmbCost.visible = false;
+                ItemUtil.UpdateItemNeedNum(_ui.m_comCost.target, _shopCfg.costId, (int)_buyCount * _shopCfg.price);
+            }
         }
 
 
@@ -153,7 +165,7 @@ namespace GFGGame
         private async void OnBtnExchangeClick()
         {
             ShopCfg cfg = ShopCfgArray.Instance.GetCfg(_goodIds);
-            if (ItemDataManager.GetItemNum(cfg.costId) < cfg.price)
+            if (cfg.costType != CostType.RMB && ItemDataManager.GetItemNum(cfg.costId) < cfg.price)
             {
                 PromptController.Instance.ShowFloatTextPrompt("道具不足");
                 return;

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

@@ -9,11 +9,16 @@ namespace GFGGame
     public class StoreArenaView : BaseWindow
     {
         private UI_StoreExchangeUI _ui;
+        private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
 
         public override void Dispose()
         {
-
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -32,6 +37,7 @@ namespace GFGGame
             this.clickBlankToClose = false;
 
             _ui.m_list.itemRenderer = ListItemRenderer;
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
         protected override void AddEventListener()
         {
@@ -43,12 +49,15 @@ namespace GFGGame
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_ARENA, menu2);
+            _valueBarController.OnShown();
+            _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
             UpdateView();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()
         {
@@ -58,7 +67,7 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
             _ui.m_list.numItems = _shopCfgs.Count;
         }
         private void ListItemRenderer(int index, GObject obj)

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

@@ -9,11 +9,16 @@ namespace GFGGame
     public class StoreChargeAddUpView : BaseWindow
     {
         private UI_StoreGiftBagUI _ui;
+        private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
 
         public override void Dispose()
         {
-
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -32,6 +37,7 @@ namespace GFGGame
             this.clickBlankToClose = false;
 
             _ui.m_list.itemRenderer = ListItemRenderer;
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
         protected override void AddEventListener()
         {
@@ -42,13 +48,15 @@ namespace GFGGame
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
             _ui.m_list.numItems = _shopCfgs.Count;
+            _valueBarController.OnShown();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()
         {

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

@@ -9,11 +9,16 @@ namespace GFGGame
     public class StoreChargeView : BaseWindow
     {
         private UI_StoreChargeUI _ui;
+        private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
 
         public override void Dispose()
         {
-
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -32,6 +37,7 @@ namespace GFGGame
             this.clickBlankToClose = false;
 
             _ui.m_list.itemRenderer = ListItemRenderer;
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
         protected override void AddEventListener()
         {
@@ -44,6 +50,7 @@ namespace GFGGame
             base.OnShown();
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE);
             _ui.m_list.numItems = _shopCfgs.Count;
+            _valueBarController.OnShown();
             UpdateVipProgressCom();
         }
 
@@ -54,6 +61,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()
         {

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

@@ -9,11 +9,16 @@ namespace GFGGame
     public class StoreExchangeView : BaseWindow
     {
         private UI_StoreExchangeUI _ui;
+        private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
 
         public override void Dispose()
         {
-
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -32,6 +37,7 @@ namespace GFGGame
             this.clickBlankToClose = false;
 
             _ui.m_list.itemRenderer = ListItemRenderer;
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
         protected override void AddEventListener()
         {
@@ -43,12 +49,15 @@ namespace GFGGame
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, menu2);
+            _valueBarController.OnShown();
+            _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
             UpdateView();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()
         {
@@ -58,7 +67,7 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
             _ui.m_list.numItems = _shopCfgs.Count;
         }
         private void ListItemRenderer(int index, GObject obj)

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

@@ -9,11 +9,16 @@ namespace GFGGame
     public class StoreGiftBagView : BaseWindow
     {
         private UI_StoreGiftBagUI _ui;
+        private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
 
         public override void Dispose()
         {
-
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -32,6 +37,7 @@ namespace GFGGame
             this.clickBlankToClose = false;
 
             _ui.m_list.itemRenderer = ListItemRenderer;
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
         protected override void AddEventListener()
         {
@@ -43,12 +49,15 @@ namespace GFGGame
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
+            _valueBarController.OnShown();
+            _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
             UpdateView();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()
         {
@@ -58,7 +67,7 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
             _ui.m_list.numItems = _shopCfgs.Count;
         }
         private void ListItemRenderer(int index, GObject obj)

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

@@ -12,7 +12,7 @@ namespace GFGGame
     public class StoreView : BaseWindow
     {
         private UI_StoreUI _ui;
-        private ValueBarController _valueBarController;
+        // private ValueBarController _valueBarController;
         private List<List<string>> _arenaSubTab = new List<List<string>>();
         private int _curTabIndex = 0;
         private int _curSubTabIndex = 0;
@@ -20,12 +20,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            if (_valueBarController != null)
-            {
-                _valueBarController.Dispose();
-                _valueBarController = null;
-            }
-
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -58,7 +52,6 @@ namespace GFGGame
                 _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), i.ToString(), "StoreArenaView" });
             }
 
-            _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sc_beijing");
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
@@ -75,12 +68,11 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _valueBarController.OnShown();
             //this.viewData[functionId][subTabIndex]
-            string functionId = this.viewData == null ? "" : (this.viewData as object[])[0].ToString();
+            _curTabIndex = this.viewData == null ? ConstStoreTabId.STORE_CHARGE : (int)(this.viewData as object[])[0];
 
-            StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfgByfunctionId(functionId);
-            _curTabIndex = tabCfg == null ? 1 : tabCfg.index;
+            // 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);
 
@@ -96,7 +88,6 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            _valueBarController.OnHide();
             _ui.m_comTab.m_c1.selectedIndex = 0;
             _ui.m_listSubTab.selectedIndex = 0;