Merge commit '69fe170e40f87e8f546ef31026f438ad20d9beb4' into yujie

* commit '69fe170e40f87e8f546ef31026f438ad20d9beb4':
  商店
  商城
  商店
  商店
  物品item
  礼包
  礼包
  礼包
  礼包
  礼包
  商城
  充值

# Conflicts:
#	FGUIProject/assets/CommonGame/package.xml
#	FGUIProject/assets/League/components/ListGiftButItem.xml
#	GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
#	GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
#	GameClient/Assets/ResIn/UI/League/League_atlas0.png
#	GameClient/Assets/ResIn/UI/League/League_fui.bytes

FGUIProject/assets/Common/components/ComBg.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1157" overflow="hidden">
   <displayList>
-    <image id="n23_r9ri" name="n23" src="r9ritjk" fileName="imgnew/tc_tydikua_1.png" xy="0,6"/>
-    <image id="n21_si5z" name="n21" src="si5ztie" fileName="imgnew/tc_tydikua_3.png" xy="0,0">
+    <image id="n23_r9ri" name="n23" src="r9ritjk" fileName="components/tc_tydikua_1.png" xy="0,6">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n21_si5z" name="n21" src="si5ztie" fileName="components/tc_tydikua_3.png" xy="0,0">
       <relation target="" sidePair="top-top"/>
     </image>
-    <image id="n22_si5z" name="n22" src="si5ztif" fileName="imgnew/tc_tydikua_52.png" xy="0,1143">
+    <image id="n22_si5z" name="n22" src="si5ztif" fileName="components/tc_tydikua_52.png" xy="0,1143">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
   </displayList>

FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1137" opaque="false">
+<component size="962,1264" opaque="false">
   <displayList>
-    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,15" size="962,1106">
+    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1264">
       <relation target="n17_ohbx" sidePair="height-height,middle-middle"/>
     </component>
-    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,30" group="n17_ohbx"/>
-    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,489" size="962,596" group="n17_ohbx"/>
-    <group id="n17_ohbx" name="grpTips" xy="0,30" size="962,1055" advanced="true" layout="vt" excludeInvisibles="true">
+    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,-27" group="n17_ohbx"/>
+    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,643" size="962,596" group="n17_ohbx"/>
+    <group id="n17_ohbx" name="grpTips" xy="0,-27" size="962,1267" advanced="true" layout="vt" excludeInvisibles="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
+  <relation target="n17_ohbx" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,40 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,970">
+<component size="962,1025">
   <displayList>
-    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,-11" size="962,992">
-      <relation target="" sidePair="height-height"/>
+    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1025">
+      <relation target="n33_l500" sidePair="height-height"/>
     </component>
     <text id="n5_si5z" name="txtName" xy="65,58" size="186,61" group="n12_si5z" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
-    <text id="n6_si5z" name="txtOwned" xy="747,80" pivot="1,0" size="134,41" group="n12_si5z" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
+    <text id="n6_si5z" name="txtOwned" xy="752,80" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
     <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,130" group="n12_si5z"/>
     <loader id="n8_si5z" name="loaRarity" xy="40,164" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
     <loader id="n9_si5z" name="loaIcon" xy="165,253" pivot="0.5,0.5" anchor="true" size="200,200" group="n12_si5z" aspect="true" autoSize="true"/>
     <image id="n10_si5z" name="n10" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="357,167" group="n12_si5z"/>
     <text id="n11_si5z" name="txtDesc" xy="375,189" size="506,166" group="n12_si5z" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="237,314" pivot="1,0" size="62,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
-    <group id="n12_si5z" name="n12" xy="40,58" size="866,313"/>
-    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,445" size="897,15" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="359,423" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
-    <group id="n4_si5z" name="n4" xy="32,423" size="897,54"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,530" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,528" group="n19_si5z">
+    <text id="n28_s5s9" name="txtExchangeCount" xy="243,314" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
+    <group id="n12_si5z" name="n12" xy="40,58" size="866,313" group="n33_l500" advanced="true"/>
+    <list id="n32_l500" name="listItem" xy="205,391" pivot="0.5,0" size="569,131" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,564" size="897,15" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="359,542" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
+    <group id="n4_si5z" name="n4" xy="32,542" size="897,54" group="n34_l500"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,619" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,617" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,529" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,527" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,618" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,616" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="341,535" pivot="0.5,0" size="48,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="175,527" size="612,70"/>
-    <text id="n24_si5z" name="txtTips" xy="318,648" pivot="0.5,0" size="326,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,739" pivot="0.5,0" group="n26_si5z" controller="c1,0"/>
-    <group id="n26_si5z" name="n26" xy="318,648" size="326,137" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true"/>
-    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,827" group="n20_si5z">
+    <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="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,863" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,827" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,863" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="124,827" size="714,89"/>
+    <group id="n20_si5z" name="n20" xy="124,863" size="714,89" group="n34_l500"/>
+    <group id="n34_l500" name="n34" xy="32,542" size="897,410" group="n33_l500" advanced="true"/>
+    <group id="n33_l500" name="n33" xy="32,58" size="897,894" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/ComItemIconNew.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="260,260">
+<component size="124,124">
   <displayList>
-    <image id="n25_pu55" name="n25" src="9jv6tlu" fileName="images/lm_daoju_db.png" xy="0,0"/>
-    <loader id="n12_ehs9" name="loaIcon" xy="130,130" pivot="0.5,0.5" anchor="true" size="200,200" group="n30_9jv6" url="ui://xz8kxrecng0i27" fill="scaleFree" autoSize="true"/>
-    <text id="n17_j48o" name="txtHasCount" xy="131,261" pivot="0.5,0" anchor="true" size="102,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
-    <loader id="n18_j48o" name="loaRarity" xy="183,18" size="44,94" group="n30_9jv6" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="40,109" size="178,40" group="n29_pu55"/>
-    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="40,109" size="178,40" group="n29_pu55"/>
-    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="49,109" size="160,40" group="n29_pu55"/>
-    <group id="n29_pu55" name="n29" xy="40,109" size="178,40" group="n30_9jv6" advanced="true"/>
-    <image id="n24_pu55" name="n24" src="pu55tiw" fileName="images/pfjl_and.png" xy="19,19" size="221,220" group="n27_pu55"/>
-    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="87,104" size="85,49" group="n27_pu55"/>
-    <group id="n27_pu55" name="grpGot" xy="19,19" size="221,220" group="n30_9jv6" visible="false" advanced="true"/>
-    <group id="n30_9jv6" name="n30" xy="19,18" size="221,279"/>
+    <image id="n25_pu55" name="n25" src="l500tlv" fileName="imagesNew/wpk_db_1.png" xy="1,1" group="n30_9jv6"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="63,63" pivot="0.5,0.5" anchor="true" size="102,102" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="64,194" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="89,7" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
+    <image id="n31_l500" name="n31" src="l500tlw" fileName="imagesNew/wpk_sz_db.png" xy="7,86" group="n30_9jv6"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-27,42" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-27,42" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="-18,42" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="-27,42" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="6,6" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="20,37" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="6,6" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="-27,1" size="178,229"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/ComItemNew.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="260,260" overflow="hidden" opaque="false">
+<component size="124,124" pivot="0.5,0.5" overflow="hidden" opaque="false">
   <displayList>
     <component id="n25_pu55" name="comItemIcon" src="9jv6tlt" fileName="components/ComItemIconNew.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
-    <text id="n15_ehs9" name="txtCount" xy="243,203" pivot="1,0" anchor="true" size="69,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#5b4b35" align="right" vars="true" text="x200">
-      <relation target="n25_pu55" sidePair="right-right,top-top"/>
+    <text id="n15_ehs9" name="txtCount" xy="61,78" pivot="0.5,0" anchor="true" size="97,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" vars="true" text="x00200">
+      <relation target="n25_pu55" sidePair="center-center"/>
     </text>
-    <text id="n26_r9ri" name="txtName" xy="131,260" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+    <text id="n26_r9ri" name="txtName" xy="62,124" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
       <relation target="n25_pu55" sidePair="bottom-bottom"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/components/ComTipsBase.xml

@@ -1,27 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,520">
   <displayList>
-    <text id="n1_s2cc" name="txtName" xy="65,50" size="184,61" group="n24_u2u3" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
-    <text id="n3_s2cc" name="txtOwned" xy="744,72" pivot="1,0" size="137,41" group="n24_u2u3" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
+    <text id="n1_s2cc" name="txtName" xy="65,50" size="186,61" group="n24_u2u3" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
+    <text id="n3_s2cc" name="txtOwned" xy="752,72" pivot="1,0" size="129,41" group="n24_u2u3" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
     <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,122" group="n24_u2u3"/>
     <loader id="n8_si5z" name="loaIcon" xy="187,270" pivot="0.5,0.5" anchor="true" size="200,200" group="n24_u2u3" aspect="true" autoSize="true"/>
     <loader id="n6_ohbx" name="loaRarity" xy="249,156" size="44,94" group="n24_u2u3" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
     <image id="n20_r9ri" name="n20" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="354,162" group="n24_u2u3"/>
     <text id="n9_si5z" name="txtDesc" xy="375,181" size="506,166" group="n24_u2u3" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
     <group id="n24_u2u3" name="n24" xy="56,50" size="850,320" group="n25_u2u3" advanced="true"/>
-    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesExport/kp_sx_1.png" xy="75,390" size="50,50" group="n19_si5z"/>
-    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesExport/kp_sx_2.png" xy="300,390" size="50,50" group="n19_si5z"/>
-    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesExport/kp_sx_3.png" xy="525,390" size="50,50" group="n19_si5z"/>
-    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesExport/kp_sx_4.png" xy="750,390" size="50,50" group="n19_si5z"/>
-    <text id="n15_si5z" name="txtGong" xy="135,394" size="72,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n16_si5z" name="txtShang" xy="360,394" size="72,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n17_si5z" name="txtJue" xy="585,394" size="72,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n18_si5z" name="txtZhi" xy="810,394" size="72,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,390" size="50,50" group="n19_si5z"/>
+    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_2.png" xy="300,390" size="50,50" group="n19_si5z"/>
+    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_3.png" xy="525,390" size="50,50" group="n19_si5z"/>
+    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,390" size="50,50" group="n19_si5z"/>
+    <text id="n15_si5z" name="txtGong" xy="135,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n16_si5z" name="txtShang" xy="360,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n17_si5z" name="txtJue" xy="585,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n18_si5z" name="txtZhi" xy="810,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
     <group id="n19_si5z" name="grpScore" xy="75,390" size="807,50" group="n25_u2u3" advanced="true"/>
     <list id="n21_u2u3" name="listTag" xy="71,460" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
       <item/>
       <item/>
     </list>
+    <list id="n26_l500" name="listItem" xy="196,521" pivot="0.5,0" size="569,131" group="n25_u2u3" visible="false" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+      <item/>
+      <item/>
+      <item/>
+    </list>
     <group id="n25_u2u3" name="n25" xy="56,50" size="850,451" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
   </displayList>
   <relation target="n25_u2u3" sidePair="height-height"/>

FGUIProject/assets/CommonGame/package.xml

@@ -298,6 +298,9 @@
     <image id="9jv66j" name="lm_zsx0.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh40" name="tanchuang.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="255,165,510,239"/>
     <image id="wm603t" name="lm_zhuangshixian_duan.png" path="/imagesNew/" exported="true"/>
+    <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
+    <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
+    <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -4,17 +4,18 @@
     <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/Button17.xml" xy="126,588" group="n22_9jv6" pkg="eg2y0ldp">
+      <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="-438,485" pivot="0.5,0" size="1255,267" group="n22_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <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">
+      <item/>
       <item/>
       <item/>
       <item/>
     </list>
     <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="-438,0" size="1255,801"/>
+    <group id="n22_9jv6" name="n22" xy="-113,0" size="601,801"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItem.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="386,759">
-  <controller name="c1" pages="0,,1," selected="1">
+  <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="可领取"/>
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <loader id="n29_9jv6" name="n29" xy="5,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65p" align="center" vAlign="middle" autoSize="true">
+    <loader id="n29_9jv6" name="n29" xy="5,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65s" align="center" vAlign="middle" autoSize="true">
       <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv65s" default="ui://tw70qm9d9jv65p"/>
     </loader>
     <loader id="n21_9jv6" name="loaType" xy="22,101" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
     <loader id="n15_pvb4" name="loaIcon" xy="137,260" pivot="0.5,0.5" size="112,112" group="n28_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <list id="n13_pvb4" name="listGift" xy="-363,493" pivot="0.5,0" size="1113,266" group="n28_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <list id="n13_pvb4" name="listGift" xy="-113,493" pivot="0.5,0" size="612,129" group="n28_9jv6" scale="0.65,0.65" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
       <item/>
       <item/>
       <item/>
@@ -19,6 +19,6 @@
     <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="28,300" group="n28_9jv6">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <group id="n28_9jv6" name="n28" xy="-363,0" size="1113,759"/>
+    <group id="n28_9jv6" name="n28" xy="-113,0" size="612,754"/>
   </displayList>
 </component>

FGUIProject/assets/Store/ItemExchangeUI.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="962,695">
-  <displayList>
-    <component id="n0_hinb" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,695"/>
-    <text id="n5_hinb" name="txtName" xy="426,28" pivot="0.5,0" size="116,74" fontSize="56" color="#8f6e30" align="center" text="名字"/>
-    <image id="n19_ai2z" name="n19" src="dmsi1o" fileName="images/sc_tc_kuang_2.png" xy="64,148" group="n21_ai2z"/>
-    <loader id="n4_hinb" name="icon" xy="73,158" size="200,200" group="n21_ai2z" aspect="true"/>
-    <loader id="n17_ugdz" name="rarity" xy="231,158" size="44,94" group="n21_ai2z" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n28_10not" name="txtNum" xy="139,313" pivot="0.5,0" size="69,49" group="n21_ai2z" fontSize="36" color="#fff7e6" align="center" strokeColor="#816531" text="x10"/>
-    <text id="n29_10not" name="txtLastCount" xy="102,358" pivot="0.5,0" size="138,44" group="n21_ai2z" fontSize="32" color="#bc8068" text="剩余:100"/>
-    <group id="n21_ai2z" name="n21" xy="64,148" size="220,254"/>
-    <text id="n30_10not" name="txtHasCount" xy="708,121" size="138,46" fontSize="34" color="#a38e66" align="center" ubb="true" text="已拥有："/>
-    <text id="n32_10not" name="n32" xy="56,422" size="180,59" group="n22_ai2z" fontSize="44" color="#a08249" align="center" text="兑换数量"/>
-    <image id="n8_hinb" name="n8" src="dmsi1p" fileName="images/sc_tc_kuang_3.png" xy="257,429" group="n22_ai2z"/>
-    <text id="n25_t1at" name="txtCount" xy="384,426" size="200,56" group="n22_ai2z" fontSize="42" color="#fdf3d7" align="center" vAlign="middle" autoSize="none" text="找钱"/>
-    <component id="n9_hinb" name="btnPlus" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="652,421" group="n22_ai2z"/>
-    <component id="n10_hinb" name="btnMinus" src="hinb5t" fileName="components/ButtonMinus1.xml" pkg="eg2y0ldp" xy="248,421" group="n22_ai2z"/>
-    <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" pkg="eg2y0ldp" xy="761,417" group="n22_ai2z">
-      <Button icon="ui://p9mtgheodmsi1n"/>
-    </component>
-    <group id="n22_ai2z" name="n22" xy="56,417" size="849,75"/>
-    <image id="n18_ai2z" name="n18" src="j48o9a" fileName="images/kp_sjsj_di_4.png" pkg="eg2y0ldp" xy="346,521" size="276,34" group="n16_ugdz"/>
-    <text id="n20_ai2z" name="n20" xy="374,510" size="76,49" group="n27_10not" fontSize="36" color="#a08249" text="花费"/>
-    <loader id="n14_ugdz" name="iconPrice" xy="459,519" size="32,32" group="n27_10not" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n15_ugdz" name="txtPrice" xy="500,510" size="93,49" group="n27_10not" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
-    <group id="n27_10not" name="n27" xy="374,510" size="219,49" group="n16_ugdz"/>
-    <group id="n16_ugdz" name="n16" xy="346,510" size="276,49" advanced="true"/>
-    <component id="n6_hinb" name="btnExchange" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="294,566">
-      <Button title="兑换"/>
-    </component>
-    <text id="n31_10not" name="txtDiscribe" xy="331,176" size="546,96" fontSize="36" color="#a38b64" autoSize="none" text="描述描述描述描述描述描述描述描述"/>
-  </displayList>
-  <relation target="n0_hinb" sidePair="height-height"/>
-</component>

FGUIProject/assets/Store/StoreChargeUI.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <displayList>
+    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
+    <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"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n29_hhx9" name="n29" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Store/StoreExchangeUI.xml

@@ -0,0 +1,21 @@
+<?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">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n2_l500" name="n2" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Store/StoreGiftBagUI.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <displayList>
+    <list id="n0_l500" name="list" xy="74,495" size="932,1333" layout="flow_hz" overflow="scroll" lineGap="10" colGap="30" defaultItem="ui://p9mtgheol500tbe" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n2_l500" name="n2" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/Button5.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="148,35" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n9_l500" name="txtIcon" xy="3,-4" size="36,44" group="n8_l500" fontSize="32" color="#5a3e16" align="center" text="￥"/>
+    <loader id="n3_l500" name="loaIcon" xy="41,-2" size="40,40" group="n8_l500" aspect="true" visible="false" url="ui://eg2y0ldpkztethq" fill="scale"/>
+    <text id="n5_l500" name="txtOriginalPrice" xy="46,-3" pivot="0.5,0" size="50,44" group="n7_l500" fontSize="32" color="#725e41" align="center" text="999"/>
+    <image id="n6_l500" name="n6" src="fqortas" fileName="imagesNew/sc_jinxiexian.png" xy="41,16" pivot="0.5,0" group="n7_l500">
+      <relation target="n5_l500" sidePair="width-width"/>
+    </image>
+    <group id="n7_l500" name="grpOriginalPrice" xy="41,-3" size="60,44" group="n8_l500" advanced="true"/>
+    <text id="n4_l500" name="txtPrice" xy="103,-9" size="43,54" group="n8_l500" fontSize="40" color="#5a3e16" text="99"/>
+    <group id="n8_l500" name="n8" xy="3,-9" size="143,54" advanced="true" layout="hz" colGap="2" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Store/components/ComVipLv.xml

@@ -2,20 +2,20 @@
 <component size="956,220">
   <displayList>
     <image id="n33_hhx9" name="n33" src="hhx91" fileName="imagesNew/VipLevel_baseboard.png" xy="0,0"/>
-    <text id="n34_hhx9" name="txtLv" xy="60,65" pivot="0.5,0" size="128,94" group="n38_hhx9" font="ui://p9mtgheohhx91g" fontSize="28" color="#8c8580" text="45"/>
-    <text id="n35_hhx9" name="n35" xy="38,114" size="31,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="lv."/>
-    <image id="n36_hhx9" name="n36" src="fqortau" fileName="imagesNew/sc_xian.png" xy="31,152" size="168,4" group="n38_hhx9"/>
+    <text id="n34_hhx9" name="txtLv" xy="55,65" pivot="0.5,0" size="116,94" group="n38_hhx9" font="ui://p9mtgheohhx91g" fontSize="28" color="#8c8580" letterSpacing="-12" text="88"/>
+    <text id="n35_hhx9" name="n35" xy="40,114" size="31,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="lv."/>
     <text id="n37_hhx9" name="n37" xy="57,154" size="116,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="会员等级"/>
-    <group id="n38_hhx9" name="n38" xy="31,65" size="168,128"/>
+    <group id="n38_hhx9" name="n38" xy="40,65" size="133,128"/>
     <component id="n39_hhx9" name="proExp" src="hhx91p" fileName="components/ProgressBar1.xml" xy="250,139">
       <ProgressBar value="50" max="100"/>
     </component>
     <text id="n40_hhx9" name="n40" xy="265,86" size="100,44" group="n43_hhx9" fontSize="32" color="#8c8580" text="再获得"/>
     <loader id="n41_hhx9" name="loaIcon" xy="365,86" size="45,45" group="n43_hhx9" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n42_hhx9" name="txtTips" xy="410,87" size="323,44" group="n43_hhx9" fontSize="32" color="#8c8580" ubb="true" vars="true" text="{exp=0}积分可升级为[color=#5A3E16]{lv=0}[/color]级会员"/>
+    <text id="n42_hhx9" name="txtTips" xy="410,87" size="323,44" group="n43_hhx9" fontSize="32" color="#8c8580" ubb="true" vars="true" text="{exp=0}积分可升级为[color=#5A3E16]{vipLv=0}[/color]级会员"/>
     <group id="n43_hhx9" name="grpTips" xy="265,86" size="468,45" advanced="true" layout="hz" excludeInvisibles="true"/>
     <component id="n44_hhx9" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="862,63" size="52,52">
       <Button icon="ui://p9mtgheofqortar"/>
     </component>
+    <text id="n45_l500" name="txtTipsFull" xy="505,107" size="100,44" fontSize="32" color="#8c8580" ubb="true" vars="true" text="已满级"/>
   </displayList>
 </component>

FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -1,45 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="478,401">
-  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="0"/>
-  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0"/>
+<component size="460,270" overflow="hidden">
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1">
+    <remark page="0" value="可购买"/>
+    <remark page="1" value="已售罄"/>
+  </controller>
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0">
+    <remark page="0" value="未解锁"/>
+    <remark page="1" value="已解锁"/>
+  </controller>
   <displayList>
-    <image id="n22_10not" name="n22" src="dmsi1k" fileName="images/sc_kuangdikjia_2.png" xy="0,0"/>
-    <image id="n24_10not" name="n24" src="dmsi1j" fileName="images/sc_kuangczcz.png" xy="2,98" group="n26_10not"/>
-    <text id="n25_10not" name="txtDesc" xy="23,121" size="80,78" group="n26_10not" fontSize="32" color="#ffe5cf" align="center" leading="-5" letterSpacing="-2" vars="true" text="超值&#xA;{count=250}%"/>
-    <group id="n26_10not" name="grpDiscount" xy="2,98" size="128,132" advanced="true"/>
-    <loader id="n23_10not" name="icon" xy="56,186" size="140,140" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
-    <text id="n27_10not" name="txtName" xy="346,135" pivot="0.5,0" anchor="true" size="85,56" fontSize="42" color="#906d4b" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
-    <image id="n28_10not" name="n28" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="269,232" group="n30_10not"/>
-    <text id="n29_10not" name="txtEndTime" xy="300,230" pivot="0.5,0" size="90,41" group="n30_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
-    <group id="n30_10not" name="grpEndTime" xy="269,230" size="155,42" advanced="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </group>
-    <text id="n32_10not" name="txtLimit" xy="41,332" pivot="0.5,0" size="177,36" fontSize="26" color="#ab9a87" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（0/1）">
-      <gearDisplay controller="c1" pages="0"/>
-    </text>
-    <text id="n31_10not" name="txtLock" xy="347,300" pivot="0.5,0" anchor="true" size="215,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
-      <gearDisplay controller="c2" pages="1"/>
-    </text>
-    <loader id="n36_iftf" name="loaIcon" xy="246,294" size="60,60" group="n38_iftf" visible="false" url="ui://vlgobc15iftftad" fill="scaleFree"/>
-    <text id="n37_iftf" name="txtIcon" xy="245,299" pivot="0.5,0" size="44,54" group="n38_iftf" fontSize="40" color="#896e5f" text="￥"/>
-    <group id="n38_iftf" name="grpIcon" xy="246,299" size="44,54" group="n43_iftf" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <text id="n39_iftf" name="txtOriginalPrice" xy="303,299" pivot="0.5,0" size="71,54" group="n41_iftf" fontSize="40" color="#bca89d" align="center" text="100"/>
-    <image id="n40_iftf" name="n40" src="iftftae" fileName="images/sc_xtxtxt(1).png" xy="306,326" pivot="0.5,0" size="72,2" group="n41_iftf">
-      <relation target="n39_iftf" sidePair="width-width"/>
-    </image>
-    <group id="n41_iftf" name="grpOriginalPrice" xy="300,299" size="78,54" group="n43_iftf" advanced="true"/>
-    <text id="n42_iftf" name="txtPrice" xy="391,299" pivot="0.5,0" size="48,54" group="n43_iftf" fontSize="40" color="#896e5f" align="right" text="10"/>
-    <group id="n43_iftf" name="grpPrice" xy="246,299" size="196,54" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
-      <gearDisplay controller="c1" pages="0"/>
-      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+    <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">
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n44_iftf" name="n44" xy="291,296" size="124,54" fontSize="40" color="#a59f8f" align="center" text="已售罄">
+    <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="340,26" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" 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="241,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="339,120" pivot="0.5,0" anchor="true" size="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+      <gearDisplay controller="c2" pages="0"/>
+    </text>
+    <text id="n44_iftf" name="n44" xy="280,120" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+      <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>
-    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="3,96">
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/Store/components/ListShopItem.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="290,455" overflow="hidden">
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="0">
+    <remark page="0" value="可购买"/>
+    <remark page="1" value="已售罄"/>
+  </controller>
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0">
+    <remark page="0" value="未解锁"/>
+    <remark page="1" value="已解锁"/>
+  </controller>
+  <displayList>
+    <image id="n22_10not" name="n22" src="hhx9w" fileName="imagesNew/GiftBag_baseboard.png" xy="0,0"/>
+    <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"/>
+    <text id="n50_l500" name="n50" xy="262,310" size="22,36" group="n51_l500" fontSize="26" color="#ffffff" letterSpacing="-2" text="%"/>
+    <group id="n51_l500" name="n51" xy="207,301" size="77,51" group="n26_10not" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </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="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="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+      <gearDisplay controller="c2" pages="0"/>
+    </text>
+    <text id="n57_l500" name="n57" xy="93,157" size="112,49" fontSize="36" color="#a59f8f" 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"/>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/ProgressBar1.xml

@@ -5,7 +5,7 @@
     <image id="n0_hhx9" name="n0" src="hhx9e" fileName="imagesNew/VipLevel_Progress_frame1.png" xy="4,3" size="655,18">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_hhx9" name="bar" src="hhx9f" fileName="imagesNew/VipLevel_Progress_fill.png" xy="4,3" size="656,18"/>
+    <image id="n1_hhx9" name="bar" src="hhx9f" fileName="imagesNew/VipLevel_Progress_fill.png" xy="4,3" size="656,18" fillMethod="hz"/>
     <image id="n2_hhx9" name="n2" src="hhx9d" fileName="imagesNew/VipLevel_Progress_frame2.png" xy="0,0" fillMethod="hz"/>
     <text id="n4_hhx9" name="txttitle" xy="576,21" pivot="1,0" size="71,39" fontSize="28" color="#8c8580" align="right" ubb="true" vars="true" text="[color=#5A3E16]{value=0}[/color]/{max=100}"/>
   </displayList>

FGUIProject/assets/Store/package.xml

@@ -50,7 +50,7 @@
     <image id="fqortap" name="sc_zhuangshihua.png" path="/imagesNew/"/>
     <image id="fqortaq" name="sc_tab_xuanzhong.png" path="/imagesNew/"/>
     <image id="fqortar" name="sc_xiangqing.png" path="/imagesNew/"/>
-    <image id="fqortas" name="sc_jinxiexian.png" path="/imagesNew/"/>
+    <image id="fqortas" name="sc_jinxiexian.png" path="/imagesNew/" scale="9grid" scale9grid="15,2,30,4"/>
     <image id="fqortau" name="sc_xian.png" path="/imagesNew/" scale="9grid" scale9grid="11,1,22,2"/>
     <image id="fqortav" name="sc_subTab_xz.png" path="/imagesNew/"/>
     <image id="fqortaw" name="sc_subtab.png" path="/imagesNew/"/>
@@ -64,7 +64,6 @@
     <image id="fqortb7" name="sc_beijing_shang.png" path="/imagesNew/"/>
     <image id="fqortb8" name="sc_yeqian_zhedang.png" path="/imagesNew/"/>
     <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
-    <component id="10nota8" name="ItemExchangeUI.xml" path="/" exported="true"/>
     <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
     <component id="hhx90" name="ComZhuangShi.xml" path="/components/"/>
     <image id="hhx91" name="VipLevel_baseboard.png" path="/imagesNew/"/>
@@ -130,7 +129,12 @@
     <component id="hhx91p" name="ProgressBar1.xml" path="/components/"/>
     <image id="hhx91q" name="sc_beijing.png" path="/imagesNew/" atlas="alone_npot"/>
     <component id="hhx91r" name="ComVipLv.xml" path="/components/"/>
-    <component id="l500tb9" name="ChargeUI.xml" path="/" exported="true"/>
+    <component id="l500tb9" name="StoreChargeUI.xml" path="/" exported="true"/>
+    <component id="l500tbb" name="Button5.xml" path="/components/"/>
+    <component id="l500tbc" name="StoreGiftBagUI.xml" path="/" exported="true"/>
+    <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"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -2,10 +2,10 @@ namespace GFGGame
 {
     public class ConstBuyType
     {
-        public const int TYPE_NORMAL = 0;//无类型兑换，无表格
+        // public const int TYPE_NORMAL = 0;//无类型兑换，无表格
         public const int TYPE_ITEM = 1;//物品兑换，对应兑换表
         public const int TYPE_SHOP = 2;//商店兑换，对应商店表
-        public const int TYPE_ITEM_Store = 2;//物品兑换，对应兑换商店表
+        // public const int TYPE_ITEM_Store = 2;//物品兑换，对应兑换商店表
 
     }
 }

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

@@ -3,8 +3,8 @@ namespace GFGGame
     public class ConstStoreTabId
     {
         public const int STORE_CHARGE = 1;//商城-充值
-        public const int STORE_GIFT_BAG = 2;//商城-礼包
-        public const int STORE_MONTH_CARD = 3;//商城-月卡
+        public const int STORE_MONTH_CARD = 2;//商城-月卡
+        public const int STORE_GIFT_BAG = 3;//商城-礼包
         public const int STORE_EXCHANGE = 4;//商城-兑换
         public const int STORE_ARENA = 5;//商城-竞技场
 

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

@@ -20,14 +20,14 @@ namespace GFGGame
         /// <param name="showTips">是否弹购买成功飘字，默认是</param>
         /// <param name="openSource">是否打开来源界面。默认否</param>
         /// <param name="count">兑换总量</param>
-        public static void Show(int itemId, long count, int buyType = ConstBuyType.TYPE_NORMAL, int shopType = 0, Action onSuccess = null, bool showTips = true, bool openSource = false, int maxCount = 9990)
+        public static void Show(int itemId, long count, int buyType = ConstBuyType.TYPE_SHOP, Action onSuccess = null, bool showTips = true, bool openSource = false, int maxCount = 9990)
         {
             if (_buyCountView == null)
             {
                 _buyCountView = new BuyCountView();
             }
             _buyCountView.Reset();
-            _buyCountView.SetParams(itemId, count, buyType, shopType, onSuccess, showTips, openSource, maxCount);
+            _buyCountView.SetParams(itemId, count, buyType, onSuccess, showTips, openSource, maxCount);
             _buyCountView.Show();
 
         }

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

@@ -108,7 +108,8 @@ namespace GFGGame
             await StorageSProxy.ReqGetClientValues();
             await SuitFosterProxy.SendGetSuitInfos();
             await ActivitySProxy.ReqSevenDayLoginInfos();
-            await RechargeSProxy.ReqRequestGiftBagInfo();
+            // await RechargeSProxy.ReqRequestGiftBagInfo();
+            await ShopSProxy.ReqShopInfo();
             await StudioSProxy.ReqStudioInfos();
             await RoleInfoSProxy.ReqPersonalInfo();
 
@@ -237,9 +238,9 @@ namespace GFGGame
             ItemHelper.GetItemAttributeInfos().Coroutine();
             MainStorySProxy.GetStoryInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
-            RechargeSProxy.ReqRechargeInfo().Coroutine();
-            RechargeSProxy.ReqExchangeInfo().Coroutine();
             TaskSProxy.GetTaskInfos();
+            // RechargeSProxy.ReqRechargeInfo().Coroutine();
+            // RechargeSProxy.ReqExchangeInfo().Coroutine();
             DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
             MailSProxy.ReqMailCount().Coroutine();

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

@@ -134,16 +134,16 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetRechargeGiftFreeRed()
         {
-            List<GiftBagCfg> _giftCfgs = ShopDataManager.Instance.GetGiftBagCfgs();
-            for (int i = 0; i < _giftCfgs.Count; i++)
-            {
-                GiftBagCfg cfg = _giftCfgs[i];
-                bool isUnLock = ShopDataManager.Instance.GetGiftStateById(cfg.id);
-                int buyNum = ShopDataManager.Instance.GetGiftBuyNumById(cfg.id);
-                bool canBuy = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? true : false;
-                if (isUnLock && canBuy && cfg.price == 0) return true;
+            // List<GiftBagCfg> _giftCfgs = ShopDataManager.Instance.GetGiftBagCfgs();
+            // for (int i = 0; i < _giftCfgs.Count; i++)
+            // {
+            //     GiftBagCfg cfg = _giftCfgs[i];
+            //     bool isUnLock = ShopDataManager.Instance.GetShopGoodsStateById(cfg.id);
+            //     int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(cfg.id);
+            //     bool canBuy = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? true : false;
+            //     if (isUnLock && canBuy && cfg.price == 0) return true;
 
-            }
+            // }
             return false;
         }
         /// <summary>

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

@@ -194,6 +194,22 @@ namespace GFGGame
             roleName = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRoleName();
             roleId = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().CurrentRoleId;
         }
+        /// <summary>
+        /// 检测是否开通指定类型月卡
+        /// </summary>
+        /// <returns></returns>
+        public static bool CheckIsMonthCardOpenByType(int monthCardType)
+        {
+            if (monthCardType == MonthCardType.Gold)
+            {
+                return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldEndTime);
+            }
+            else if (monthCardType == MonthCardType.BlackGold)
+            {
+                return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldEndTime);
+            }
+            return false;
+        }
         public static OtherRoleInfoData GetOtherRoleInfoData(OtherRoleInfoProto otherRoleInfo)
         {
             OtherRoleInfoData otherRoleInfoData = new OtherRoleInfoData();

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

@@ -5,66 +5,53 @@ using ET;
 
 namespace GFGGame
 {
-    public class LockType
-    {
-        public static int NONE = 0;
-        public static int STORY_LV = 1;
-        public static int ROLE_LV = 2;
-    }
-
-    public class CostType
-    {
-        public static int FREE = 0;
-        public static int ITEM = 1;
-        public static int RMB = 2;
-    }
 
     public class ShopDataManager : SingletonBase<ShopDataManager>
     {
         public string[] refreshType = { "永久限购", "每日限购", "每周限购", "每月限购" };
 
-        private Dictionary<int, int> _rechargeDic = new Dictionary<int, int>();
-        private Dictionary<int, int> _giftDic = new Dictionary<int, int>();
-        private Dictionary<int, int> _exchangeDic = new Dictionary<int, int>();
+        // private Dictionary<int, int> _rechargeDic = new Dictionary<int, int>();
+        private Dictionary<int, int> _goodsDic = new Dictionary<int, int>();
+        // private Dictionary<int, int> _exchangeDic = new Dictionary<int, int>();
         public void Clear()
         {
-            _rechargeDic.Clear();
-            _giftDic.Clear();
-            _exchangeDic.Clear();
-        }
-        public void UpdateRechargeData(int rechargeId, int num)
-        {
-            if (!_rechargeDic.ContainsKey(rechargeId))
-            {
-                _rechargeDic.Add(rechargeId, num);
-            }
-            else
-            {
-                _rechargeDic[rechargeId] = num;
-            }
+            // _rechargeDic.Clear();
+            _goodsDic.Clear();
+            // _exchangeDic.Clear();
         }
+        // public void UpdateRechargeData(int rechargeId, int num)
+        // {
+        //     if (!_rechargeDic.ContainsKey(rechargeId))
+        //     {
+        //         _rechargeDic.Add(rechargeId, num);
+        //     }
+        //     else
+        //     {
+        //         _rechargeDic[rechargeId] = num;
+        //     }
+        // }
         public void UpdateGiftData(int giftId, int num)
         {
-            if (!_giftDic.ContainsKey(giftId))
-            {
-                _giftDic.Add(giftId, num);
-            }
-            else
-            {
-                _giftDic[giftId] = num;
-            }
-        }
-        public void UpdateExchangeData(int exchangeId, int num)
-        {
-            if (!_exchangeDic.ContainsKey(exchangeId))
+            if (!_goodsDic.ContainsKey(giftId))
             {
-                _exchangeDic.Add(exchangeId, num);
+                _goodsDic.Add(giftId, num);
             }
             else
             {
-                _exchangeDic[exchangeId] = num;
+                _goodsDic[giftId] = num;
             }
         }
+        // public void UpdateExchangeData(int exchangeId, int num)
+        // {
+        //     if (!_exchangeDic.ContainsKey(exchangeId))
+        //     {
+        //         _exchangeDic.Add(exchangeId, num);
+        //     }
+        //     else
+        //     {
+        //         _exchangeDic[exchangeId] = num;
+        //     }
+        // }
         /************************************************************************************************************/
 
         public List<ShopCfg> GetList(int storeId, int typeIndex, int scoreType)
@@ -130,65 +117,66 @@ namespace GFGGame
 
 
         /**************************************************************************************************************************/
+        // /// <summary>
+        // /// 根据充值id获取购买次数
+        // /// </summary>
+        // /// <param name="rechargeId"></param>
+        // /// <returns></returns>
+        // public int GetRechargeBuyNumById(int rechargeId)
+        // {
+        //     return !_rechargeDic.ContainsKey(rechargeId) ? 0 : _rechargeDic[rechargeId];
+        // }
         /// <summary>
-        /// 根据充值id获取购买次数
+        /// 根据商品id获取购买次数
         /// </summary>
-        /// <param name="rechargeId"></param>
+        /// <param name="goodsId"></param>
         /// <returns></returns>
-        public int GetRechargeBuyNumById(int rechargeId)
+        public int GetGoodsBuyNumById(int goodsId)
         {
-            return !_rechargeDic.ContainsKey(rechargeId) ? 0 : _rechargeDic[rechargeId];
-        }
-        /// <summary>
-        /// 根据礼包id获取购买次数
-        /// </summary>
-        /// <param name="giftId"></param>
-        /// <returns></returns>
-        public int GetGiftBuyNumById(int giftId)
-        {
-            return !_giftDic.ContainsKey(giftId) ? 0 : _giftDic[giftId];
-        }
-        /// <summary>
-        /// 根据充值id获取购买次数
-        /// </summary>
-        /// <param name="exchangeId"></param>
-        /// <returns></returns>
-        public int GetExchangeBuyNumById(int exchangeId)
-        {
-            return !_exchangeDic.ContainsKey(exchangeId) ? 0 : _exchangeDic[exchangeId];
+            return !_goodsDic.ContainsKey(goodsId) ? 0 : _goodsDic[goodsId];
         }
+        // /// <summary>
+        // /// 根据充值id获取购买次数
+        // /// </summary>
+        // /// <param name="exchangeId"></param>
+        // /// <returns></returns>
+        // public int GetExchangeBuyNumById(int exchangeId)
+        // {
+        //     return !_exchangeDic.ContainsKey(exchangeId) ? 0 : _exchangeDic[exchangeId];
+        // }
 
 
         public List<GiftBagCfg> GetGiftBagCfgs()
         {
-            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>();
+            // List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>();
 
-            List<GiftBagCfg> noneGiftBagCfgs = GetNoneGiftCfg();
-            giftBagCfgs = giftBagCfgs.Concat(noneGiftBagCfgs).ToList<GiftBagCfg>();
+            // List<GiftBagCfg> noneGiftBagCfgs = GetNoneGiftCfg();
+            // giftBagCfgs = giftBagCfgs.Concat(noneGiftBagCfgs).ToList<GiftBagCfg>();
 
-            GiftBagCfg StoryLvGiftCfg = GetStoryLvGiftCfg();
-            if (StoryLvGiftCfg != null) giftBagCfgs.Add(StoryLvGiftCfg);
-            GiftBagCfg RoleLvGiftCfg = GetRoleLvGiftCfg();
-            if (RoleLvGiftCfg != null) giftBagCfgs.Add(RoleLvGiftCfg);
-            giftBagCfgs = RemoveNotOpenCfg(giftBagCfgs);
-            SortGiftBagCfgs(giftBagCfgs);
-            return giftBagCfgs;
+            // GiftBagCfg StoryLvGiftCfg = GetStoryLvGiftCfg();
+            // if (StoryLvGiftCfg != null) giftBagCfgs.Add(StoryLvGiftCfg);
+            // GiftBagCfg RoleLvGiftCfg = GetRoleLvGiftCfg();
+            // if (RoleLvGiftCfg != null) giftBagCfgs.Add(RoleLvGiftCfg);
+            // giftBagCfgs = RemoveNotOpenCfg(giftBagCfgs);
+            // SortGiftBagCfgs(giftBagCfgs);
+            // return giftBagCfgs;
+            return null;
         }
 
-        private List<GiftBagCfg> SortGiftBagCfgs(List<GiftBagCfg> giftBagCfgs)
+        public List<ShopCfg> SortGiftBagCfgs(List<ShopCfg> shopCfgs)
         {
-            giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
+            shopCfgs.Sort((ShopCfg a, ShopCfg b) =>
             {
 
                 //未售罄的＞未解锁>已售罄的
-                int buyTypeA = (a.maxBuyNum == 0 || a.maxBuyNum - GetGiftBuyNumById(a.id) > 0) ? 1 : -1;
-                int buyTypeB = (b.maxBuyNum == 0 || b.maxBuyNum - GetGiftBuyNumById(b.id) > 0) ? 1 : -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 lockA = GetGiftStateById(a.id) ? 1 : -1;
-                int lockB = GetGiftStateById(b.id) ? 1 : -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;
 
@@ -204,16 +192,23 @@ namespace GFGGame
 
 
 
-                int descA = a.desc == "" ? 0 : int.Parse(a.desc);
-                int descB = b.desc == "" ? 0 : int.Parse(b.desc);
-                if (descA != descB) return descA - descB;
+                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;
 
 
                 return 0;
             });
-            return giftBagCfgs;
+            return shopCfgs;
+        }
+        //获取商品折扣百分比
+        public int GetShopGoodsDiscount(int goodsId)
+        {
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(goodsId);
+            if (shopCfg.price == 0) return 0;
+            return (int)(((double)shopCfg.originalPrice / (double)shopCfg.price) * 100);
         }
         private List<GiftBagCfg> RemoveNotOpenCfg(List<GiftBagCfg> giftBagCfgs)
         {
@@ -246,7 +241,7 @@ namespace GFGGame
             });
             for (int i = 0; i < giftBagCfgs.Count; i++)
             {
-                if (GetGiftStateById(giftBagCfgs[i].id) && (GetGiftBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
+                if (GetShopGoodsStateById(giftBagCfgs[i].id) && (GetGoodsBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
             }
             return giftBagCfgs[0];
         }
@@ -264,33 +259,33 @@ namespace GFGGame
             });
             for (int i = 0; i < giftBagCfgs.Count; i++)
             {
-                if (GetGiftStateById(giftBagCfgs[i].id) && (GetGiftBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
+                if (GetShopGoodsStateById(giftBagCfgs[i].id) && (GetGoodsBuyNumById(giftBagCfgs[i].id) < giftBagCfgs[i].maxBuyNum)) return giftBagCfgs[i];
             }
             return giftBagCfgs[0];
         }
 
-        public List<ShopExchangeCfg> GetExchangeCfgs()
-        {
-            List<ShopExchangeCfg> shopExchangeCfgs = new List<ShopExchangeCfg>(ShopExchangeCfgArray.Instance.dataArray);
-            shopExchangeCfgs.Sort((ShopExchangeCfg a, ShopExchangeCfg b) =>
-            {
-                //未售罄的>已售罄的
-                int buyTypeA = (a.maxLimit == 0 || a.maxLimit - GetExchangeBuyNumById(a.id) > 0) ? 1 : -1;
-                int buyTypeB = (b.maxLimit == 0 || b.maxLimit - GetExchangeBuyNumById(b.id) > 0) ? 1 : -1;
-                if (buyTypeA > buyTypeB) return -1;
-                if (buyTypeA < buyTypeB) return 1;
-                return 0;
-            });
-            return shopExchangeCfgs;
-        }
+        // public List<ShopExchangeCfg> GetExchangeCfgs()
+        // {
+        //     List<ShopExchangeCfg> shopExchangeCfgs = new List<ShopExchangeCfg>(ShopExchangeCfgArray.Instance.dataArray);
+        //     shopExchangeCfgs.Sort((ShopExchangeCfg a, ShopExchangeCfg b) =>
+        //     {
+        //         //未售罄的>已售罄的
+        //         int buyTypeA = (a.maxLimit == 0 || a.maxLimit - GetExchangeBuyNumById(a.id) > 0) ? 1 : -1;
+        //         int buyTypeB = (b.maxLimit == 0 || b.maxLimit - GetExchangeBuyNumById(b.id) > 0) ? 1 : -1;
+        //         if (buyTypeA > buyTypeB) return -1;
+        //         if (buyTypeA < buyTypeB) return 1;
+        //         return 0;
+        //     });
+        //     return shopExchangeCfgs;
+        // }
         /// <summary>
-        /// 根据礼包Id获取礼包解锁状态
+        /// 根据商品Id获取商品是否解锁解锁
         /// /// </summary>
-        /// <param name="giftId"></param>
+        /// <param name="goodsId"></param>
         /// <returns></returns>
-        public bool GetGiftStateById(int giftId)
+        public bool GetShopGoodsStateById(int goodsId)
         {
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
+            ShopCfg cfg = ShopCfgArray.Instance.GetCfg(goodsId);
 
             if (cfg.lockType == LockType.NONE)
             {
@@ -298,22 +293,58 @@ namespace GFGGame
             }
             else if (cfg.lockType == LockType.STORY_LV)
             {
-                return InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
+                return InstanceZonesDataManager.CheckLevelPass(cfg.lockValue);
             }
-            else
+            else if (cfg.lockType == LockType.ROLE_LV)
+            {
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= cfg.lockValue;
+            }
+            else if (cfg.lockType == LockType.MONTH_CARD_TYPE)
+            {
+                return RoleDataManager.CheckIsMonthCardOpenByType(cfg.lockValue);
+            }
+            else if (cfg.lockType == LockType.AREND_GRADE)
+            {
+                return ArenaDataManager.Instance.Grade >= cfg.lockValue;
+            }
+            return true;
+        }
+        /// <summary>
+        /// 根据商品Id获取商品解锁提示
+        /// /// </summary>
+        /// <param name="goodsId"></param>
+        /// <returns></returns>
+        public string GetShopGoodsStateTips(int goodsId)
+        {
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(goodsId);
+            if (shopCfg.lockType == LockType.STORY_LV)
+            {
+                StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(shopCfg.lockValue);
+                return string.Format("通关{0}-{1}解锁", StoryUtil.GetChapterOrder(storyLevelCfg.chapterId), storyLevelCfg.order);
+            }
+            else if (shopCfg.lockType == LockType.ROLE_LV)
+            {
+                return string.Format("角色达到{0}级解锁", shopCfg.lockValue);
+            }
+            else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE)
+            {
+                return string.Format("开通{0}解锁", shopCfg.lockValue == MonthCardType.Gold ? "金卡" : "黑金卡");
+            }
+            else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
-                return GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= cfg.lv;
+                return string.Format("飞花令达到{0}段位解锁", shopCfg.lockValue);
             }
+            return "";
         }
         /// <summary>
-        /// 根据礼包id获取下架时间
+        /// 根据商品id获取下架时间
         /// </summary>
-        /// <param name="giftId"></param>
+        /// <param name="goodsId"></param>
         /// <returns></returns>
-        public string GetEndTime(int giftId)
+        public string GetEndTime(int goodsId)
         {
             long endTime = 0;
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
+            ShopCfg cfg = ShopCfgArray.Instance.GetCfg(goodsId);
             if (cfg.endTime == "") return "";
 
             endTime = TimeUtil.DateTimeToTimestamp(cfg.endTime);

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

@@ -9,9 +9,9 @@ namespace GFGGame
 
     public class ShopViewManager : SingletonBase<ShopViewManager>
     {
-        public void BuyItem(int itemId, int itemCount, int shopType, ShopCfg shopCfg)
+        public void BuyItem(int itemId, int itemCount, int buyType, ShopCfg shopCfg)
         {
-            BuyItemConteoller.Show(itemId, itemCount, ConstBuyType.TYPE_SHOP, shopType, () =>
+            BuyItemConteoller.Show(itemId, itemCount, buyType, () =>
             {
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 2);
                 GetSuitItemController.TryShow(0);
@@ -19,16 +19,124 @@ namespace GFGGame
             }, true, false, GameConst.MAX_COUNT_TO_BUY_ITEMS);
         }
 
+        //更行vip进度
         public void UpdateVipProgressCom(GObject obj)
         {
             UI_ComVipLv com = UI_ComVipLv.Proxy(obj);
             com.m_txtLv.text = RoleDataManager.vipLv.ToString();
             VipCfg vipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv);
-            com.m_proExp.target.max = vipCfg.num;
-            com.m_proExp.target.value = RoleDataManager.vipExp;
+            VipCfg nextVipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv + 1);
+            com.m_txtTipsFull.visible = nextVipCfg == null;
+            if (com.m_btnRule.data == null)
+            {
+                com.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+                com.m_btnRule.data = 300009;
+            }
+            if (nextVipCfg != null)
+            {
+                com.m_proExp.target.max = vipCfg.num;
+                com.m_proExp.target.value = RoleDataManager.vipExp;
+                com.m_proExp.m_txttitle.SetVar("value", com.m_proExp.target.value.ToString()).FlushVars();
+                com.m_proExp.m_txttitle.SetVar("max", com.m_proExp.target.max.ToString()).FlushVars();
+                com.m_txtTips.SetVar("exp", (vipCfg.num - RoleDataManager.vipExp).ToString()).FlushVars();
+                com.m_txtTips.SetVar("vipLv", (nextVipCfg.id).ToString()).FlushVars();
+            }
+            UI_ComVipLv.ProxyEnd();
+        }
 
+        //更新商品item
+        public void UptadeItem(GObject obj, ShopCfg shopCfg)
+        {
+            UI_ListShopItem item = UI_ListShopItem.Proxy(obj);
 
-            UI_ComVipLv.ProxyEnd();
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+
+            item.m_txtName.text = shopCfg.itemName;
+            item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+
+            item.m_grpDiscount.visible = shopCfg.price < shopCfg.originalPrice;
+            item.m_txtDesc.text = shopCfg.price <= 0 ? "" : ShopDataManager.Instance.GetShopGoodsDiscount(shopCfg.id).ToString();
+
+            item.m_txtEndTime.SetVar("value", ShopDataManager.Instance.GetEndTime(shopCfg.id)).FlushVars();
+            item.m_txtEndTime.visible = shopCfg.endTime != "";
+
+            item.m_c2.selectedIndex = ShopDataManager.Instance.GetShopGoodsStateById(shopCfg.id) ? 1 : 0;
+            item.m_txtLock.text = ShopDataManager.Instance.GetShopGoodsStateTips(shopCfg.id);
+
+            int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+            item.m_txtLimit.visible = shopCfg.maxBuyNum > 0;
+            item.m_txtLimit.text = string.Format("{0}({1}/{2})", ShopDataManager.Instance.refreshType[shopCfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#5A3E16"), shopCfg.maxBuyNum);
+
+            item.m_c1.selectedIndex = shopCfg.maxBuyNum == 0 || buyNum < shopCfg.maxBuyNum ? 0 : 1;
+            if (item.m_c1.selectedIndex == 0)//可购买
+            {
+                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_loaIcon.visible = true;
+                    item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.price);// cfg.price.ToString();
+
+                    if (shopCfg.costType == CostType.RMB)//人民币
+                    {
+                        item.m_btnBuy.m_loaIcon.visible = false;
+                        item.m_btnBuy.m_txtIcon.visible = true;
+                        item.m_btnBuy.m_txtIcon.text = "￥";
+                    }
+                    else//道具
+                    {
+                        ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.costId);
+                        item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(costItemCfg.res);
+                        item.m_btnBuy.m_loaIcon.visible = true;
+                        item.m_btnBuy.m_txtIcon.visible = false;
+                    }
+                }
+                else
+                {
+                    item.m_btnBuy.m_txtIcon.text = "";
+                    item.m_btnBuy.m_loaIcon.visible = false;
+                    item.m_btnBuy.m_grpOriginalPrice.visible = false;
+                    item.m_btnBuy.m_txtPrice.text = "免费";
+                }
+            }
+
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnBtnBugItem);
+            }
+            item.target.data = shopCfg;
+            bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && shopCfg.price == 0;
+
+            RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100);
+            UI_ListShopItem.ProxyEnd();
+        }
+
+        private async void OnBtnBugItem(EventContext context)
+        {
+            ShopCfg cfg = (context.sender as GObject).data as ShopCfg;
+            bool isSellOut = cfg.maxBuyNum > 0 && cfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(cfg.id) <= 0;
+            if (isSellOut)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("已售罄");
+                return;
+            }
+            if (cfg.costType == CostType.RMB)
+            {
+                if (!AntiAddictionController.CheckAntiAddictionRecharge(cfg.price))
+                {
+                    ShopSProxy.ReqShopBuy(cfg.id, 1).Coroutine();
+                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+                }
+            }
+            else if (cfg.costType == CostType.FREE)
+            {
+                ShopSProxy.ReqShopBuy(cfg.id, 1).Coroutine();
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+            }
+            else
+            {
+                ViewManager.Show<ItemExchangeView>(cfg.id);
+            }
         }
     }
 }

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

@@ -18,6 +18,7 @@ namespace UI.CommonGame
         public GTextField m_txtZhi;
         public GGroup m_grpScore;
         public GList m_listTag;
+        public GList m_listItem;
         public const string URL = "ui://eg2y0ldpohbxti3";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComTipsBase";
@@ -76,6 +77,7 @@ namespace UI.CommonGame
             m_txtZhi = (GTextField)comp.GetChild("txtZhi");
             m_grpScore = (GGroup)comp.GetChild("grpScore");
             m_listTag = (GList)comp.GetChild("listTag");
+            m_listItem = (GList)comp.GetChild("listItem");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,6 +92,7 @@ namespace UI.CommonGame
             m_txtZhi = null;
             m_grpScore = null;
             m_listTag = null;
+            m_listItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -14,6 +14,7 @@ namespace UI.CommonGame
         public GLoader m_loaIcon;
         public GTextField m_txtDesc;
         public GTextField m_txtExchangeCount;
+        public GList m_listItem;
         public GTextField m_txtShow;
         public UI_Button2 m_btnMinus;
         public UI_Button16 m_btnAdd;
@@ -77,6 +78,7 @@ namespace UI.CommonGame
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtExchangeCount = (GTextField)comp.GetChild("txtExchangeCount");
+            m_listItem = (GList)comp.GetChild("listItem");
             m_txtShow = (GTextField)comp.GetChild("txtShow");
             m_btnMinus = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMinus"));
             m_btnAdd = (UI_Button16)UI_Button16.Create(comp.GetChild("btnAdd"));
@@ -96,6 +98,7 @@ namespace UI.CommonGame
             m_loaIcon = null;
             m_txtDesc = null;
             m_txtExchangeCount = null;
+            m_listItem = null;
             m_txtShow = null;
             m_btnMinus.Dispose();
             m_btnMinus = null;

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_Button5
+    {
+        public GButton target;
+        public GTextField m_txtIcon;
+        public GLoader m_loaIcon;
+        public GTextField m_txtOriginalPrice;
+        public GGroup m_grpOriginalPrice;
+        public GTextField m_txtPrice;
+        public const string URL = "ui://p9mtgheol500tbb";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "Button5";
+        private static UI_Button5 _proxy;
+
+        public static UI_Button5 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button5();
+            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_Button5 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button5();
+            }
+            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_txtIcon = (GTextField)comp.GetChild("txtIcon");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
+            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
+            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtIcon = null;
+            m_loaIcon = null;
+            m_txtOriginalPrice = null;
+            m_grpOriginalPrice = null;
+            m_txtPrice = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ItemExchangeUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button5.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0adf97d266705df459244c1dcea99270
+guid: ba301bd1112688f40b759665c5d9c27c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -13,6 +13,7 @@ namespace UI.Store
         public GTextField m_txtTips;
         public GGroup m_grpTips;
         public GButton m_btnRule;
+        public GTextField m_txtTipsFull;
         public const string URL = "ui://p9mtgheohhx91r";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ComVipLv";
@@ -66,6 +67,7 @@ namespace UI.Store
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_grpTips = (GGroup)comp.GetChild("grpTips");
             m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_txtTipsFull = (GTextField)comp.GetChild("txtTipsFull");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -76,6 +78,7 @@ namespace UI.Store
             m_txtTips = null;
             m_grpTips = null;
             m_btnRule = null;
+            m_txtTipsFull = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,113 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Store
-{
-    public partial class UI_ItemExchangeUI
-    {
-        public GComponent target;
-        public GComponent m_bg;
-        public GTextField m_txtName;
-        public GLoader m_icon;
-        public GLoader m_rarity;
-        public GTextField m_txtNum;
-        public GTextField m_txtLastCount;
-        public GTextField m_txtHasCount;
-        public GTextField m_txtCount;
-        public GButton m_btnPlus;
-        public GButton m_btnMinus;
-        public GButton m_btnAll;
-        public GLoader m_iconPrice;
-        public GTextField m_txtPrice;
-        public GButton m_btnExchange;
-        public GTextField m_txtDiscribe;
-        public const string URL = "ui://p9mtgheo10nota8";
-        public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "ItemExchangeUI";
-        private static UI_ItemExchangeUI _proxy;
-
-        public static UI_ItemExchangeUI Create(GObject gObject = null)
-        {
-            var ui = new UI_ItemExchangeUI();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ItemExchangeUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ItemExchangeUI();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_bg = (GComponent)comp.GetChild("bg");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_icon = (GLoader)comp.GetChild("icon");
-            m_rarity = (GLoader)comp.GetChild("rarity");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
-            m_txtLastCount = (GTextField)comp.GetChild("txtLastCount");
-            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_btnPlus = (GButton)comp.GetChild("btnPlus");
-            m_btnMinus = (GButton)comp.GetChild("btnMinus");
-            m_btnAll = (GButton)comp.GetChild("btnAll");
-            m_iconPrice = (GLoader)comp.GetChild("iconPrice");
-            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
-            m_btnExchange = (GButton)comp.GetChild("btnExchange");
-            m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_bg = null;
-            m_txtName = null;
-            m_icon = null;
-            m_rarity = null;
-            m_txtNum = null;
-            m_txtLastCount = null;
-            m_txtHasCount = null;
-            m_txtCount = null;
-            m_btnPlus = null;
-            m_btnMinus = null;
-            m_btnAll = null;
-            m_iconPrice = null;
-            m_txtPrice = null;
-            m_btnExchange = null;
-            m_txtDiscribe = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -0,0 +1,102 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ListGiftItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GImage m_imgDouble;
+        public GTextField m_txtDesc;
+        public GGroup m_grpDiscount;
+        public GLoader m_icon;
+        public GTextField m_txtName;
+        public GTextField m_txtEndTime;
+        public GTextField m_txtLimit;
+        public GTextField m_txtLock;
+        public UI_Button5 m_btnBuy;
+        public const string URL = "ui://p9mtgheo10not1t";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ListGiftItem";
+        private static UI_ListGiftItem _proxy;
+
+        public static UI_ListGiftItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListGiftItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListGiftItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListGiftItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_imgDouble = (GImage)comp.GetChild("imgDouble");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
+            m_icon = (GLoader)comp.GetChild("icon");
+            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"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_imgDouble = null;
+            m_txtDesc = null;
+            m_grpDiscount = null;
+            m_icon = null;
+            m_txtName = null;
+            m_txtEndTime = null;
+            m_txtLimit = null;
+            m_txtLock = null;
+            m_btnBuy.Dispose();
+            m_btnBuy = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fdd2736077e8b324c9b104b9df3b2dc8
+guid: 0b8ebd174709f8d4c93895fd4fe07205
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,102 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ListShopItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GImage m_imgDouble;
+        public GTextField m_txtDesc;
+        public GGroup m_grpDiscount;
+        public GLoader m_icon;
+        public GTextField m_txtName;
+        public GTextField m_txtEndTime;
+        public GTextField m_txtLimit;
+        public GTextField m_txtLock;
+        public UI_Button5 m_btnBuy;
+        public const string URL = "ui://p9mtgheol500tbe";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ListShopItem";
+        private static UI_ListShopItem _proxy;
+
+        public static UI_ListShopItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListShopItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListShopItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListShopItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_imgDouble = (GImage)comp.GetChild("imgDouble");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
+            m_icon = (GLoader)comp.GetChild("icon");
+            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"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_imgDouble = null;
+            m_txtDesc = null;
+            m_grpDiscount = null;
+            m_icon = null;
+            m_txtName = null;
+            m_txtEndTime = null;
+            m_txtLimit = null;
+            m_txtLock = null;
+            m_btnBuy.Dispose();
+            m_btnBuy = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListShopItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f0f439025b149e046b6243ba37b06308
+guid: 1787520cce6f9504680d251533106a31
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreChargeAddUpUI
+    {
+        public GComponent target;
+        public UI_ComVipLv m_comVipLv;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheol500tbf";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreChargeAddUpUI";
+        private static UI_StoreChargeAddUpUI _proxy;
+
+        public static UI_StoreChargeAddUpUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreChargeAddUpUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_StoreChargeAddUpUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreChargeAddUpUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comVipLv = (UI_ComVipLv)UI_ComVipLv.Create(comp.GetChild("comVipLv"));
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comVipLv.Dispose();
+            m_comVipLv = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.Store
 {
-    public partial class UI_ChargeUI
+    public partial class UI_StoreChargeUI
     {
         public GComponent target;
         public UI_ComVipLv m_comVipLv;
         public GList m_list;
         public const string URL = "ui://p9mtgheol500tb9";
         public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "ChargeUI";
-        private static UI_ChargeUI _proxy;
+        public const string RES_NAME = "StoreChargeUI";
+        private static UI_StoreChargeUI _proxy;
 
-        public static UI_ChargeUI Create(GObject gObject = null)
+        public static UI_StoreChargeUI Create(GObject gObject = null)
         {
-            var ui = new UI_ChargeUI();
+            var ui = new UI_StoreChargeUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.Store
             return ui;
         }
 
-        public static UI_ChargeUI Proxy(GObject gObject = null)
+        public static UI_StoreChargeUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ChargeUI();
+                _proxy = new UI_StoreChargeUI();
             }
             var ui = _proxy;
             if(gObject == null)

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

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

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreExchangeUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheol500tbh";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreExchangeUI";
+        private static UI_StoreExchangeUI _proxy;
+
+        public static UI_StoreExchangeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreExchangeUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_StoreExchangeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreExchangeUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreGiftBagUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheol500tbc";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreGiftBagUI";
+        private static UI_StoreGiftBagUI _proxy;
+
+        public static UI_StoreGiftBagUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreGiftBagUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_StoreGiftBagUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreGiftBagUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -43,8 +43,9 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    RechargeSProxy.ReqRequestGiftBagInfo().Coroutine();
-                    RechargeSProxy.ReqExchangeInfo().Coroutine();
+                    // RechargeSProxy.ReqRequestGiftBagInfo().Coroutine();
+                    // RechargeSProxy.ReqExchangeInfo().Coroutine();
+                    ShopSProxy.ReqShopInfo().Coroutine();
                     DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
                     SuitFosterProxy.SendGetSuitInfos().Coroutine();
                     FieldSProxy.ReqFieldInstanceInfos().Coroutine();

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

@@ -4,99 +4,99 @@ namespace GFGGame
 {
     public class RechargeSProxy
     {
-        public static async ETTask ReqRecharge(int rechargeId)
-        {
-            M2C_Recharge response = null;
-            response = (M2C_Recharge)await MessageHelper.SendToServer(new C2M_Recharge() { RechargeId = rechargeId });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    ShopDataManager.Instance.UpdateRechargeData(response.RechargeId, response.RechargedTimes);
-                    PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功", MessageType.SUCCESS);
-                    EventAgent.DispatchEvent(ConstMessage.BUY_RECHARGE_SUCCESS);
+        // public static async ETTask ReqRecharge(int rechargeId)
+        // {
+        //     M2C_Recharge response = null;
+        //     response = (M2C_Recharge)await MessageHelper.SendToServer(new C2M_Recharge() { RechargeId = rechargeId });
+        //     if (response != null)
+        //     {
+        //         if (response.Error == ErrorCode.ERR_Success)
+        //         {
+        //             ShopDataManager.Instance.UpdateRechargeData(response.RechargeId, response.RechargedTimes);
+        //             PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功", MessageType.SUCCESS);
+        //             EventAgent.DispatchEvent(ConstMessage.BUY_RECHARGE_SUCCESS);
 
-                }
-            }
-        }
-        public static async ETTask ReqRechargeInfo()
-        {
-            M2C_GetRechargeInfo response = null;
-            response = (M2C_GetRechargeInfo)await MessageHelper.SendToServer(new C2M_GetRechargeInfo() { });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    for (int i = 0; i < response.ks.Count; i++)
-                    {
-                        ShopDataManager.Instance.UpdateRechargeData(response.ks[i], response.vs[i]);
-                    }
-                }
-            }
-        }
-        public static async ETTask ReqRequestGiftBagInfo()
-        {
-            M2C_RequestGiftBagInfo response = null;
-            response = (M2C_RequestGiftBagInfo)await MessageHelper.SendToServer(new C2M_RequestGiftBagInfo() { });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    for (int i = 0; i < response.ks.Count; i++)
-                    {
-                        ShopDataManager.Instance.UpdateGiftData(response.ks[i], response.vs[i]);
-                    }
-                }
-            }
-        }
-        public static async ETTask<bool> ReqBuyGiftBag(int giftId)
-        {
-            M2C_BuyGiftBag response = null;
-            response = (M2C_BuyGiftBag)await MessageHelper.SendToServer(new C2M_BuyGiftBag() { GiftBagId = giftId });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    ShopDataManager.Instance.UpdateGiftData(response.GiftBagId, response.BuyTimes);
-                    BonusController.TryShowBonusList(GiftBagCfgArray.Instance.GetCfg(response.GiftBagId).itemsArr);
-                    EventAgent.DispatchEvent(ConstMessage.BUY_GIFT_SUCCESS);
-                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
-                    return true;
-                }
-            }
-            return false;
-        }
-        public static async ETTask ReqExchangeInfo()
-        {
-            M2C_RequestShopExchangeInfo response = null;
-            response = (M2C_RequestShopExchangeInfo)await MessageHelper.SendToServer(new C2M_RequestShopExchangeInfo() { });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    for (int i = 0; i < response.ks.Count; i++)
-                    {
-                        ShopDataManager.Instance.UpdateExchangeData(response.ks[i], response.vs[i]);
-                    }
-                }
-            }
-        }
-        public static async ETTask<bool> ReqExchangeShopItem(int exchangeId, long buyNum)
-        {
-            M2C_ExchangeShopItem response = null;
-            response = (M2C_ExchangeShopItem)await MessageHelper.SendToServer(new C2M_ExchangeShopItem() { ExchangeId = exchangeId, Times = (int)buyNum });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    ShopDataManager.Instance.UpdateExchangeData(response.ExchangeId, response.ExchangedTimes);
-                    EventAgent.DispatchEvent(ConstMessage.BUY_EXCHANGE_SUCCESS);
-                    ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(response.ExchangeId);
-                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(cfg.itemId, cfg.num * response.Times));
-                    return true;
-                }
-            }
-            return false;
-        }
+        //         }
+        //     }
+        // }
+        // public static async ETTask ReqRechargeInfo()
+        // {
+        //     M2C_GetRechargeInfo response = null;
+        //     response = (M2C_GetRechargeInfo)await MessageHelper.SendToServer(new C2M_GetRechargeInfo() { });
+        //     if (response != null)
+        //     {
+        //         if (response.Error == ErrorCode.ERR_Success)
+        //         {
+        //             for (int i = 0; i < response.ks.Count; i++)
+        //             {
+        //                 ShopDataManager.Instance.UpdateRechargeData(response.ks[i], response.vs[i]);
+        //             }
+        //         }
+        //     }
+        // }
+        // public static async ETTask ReqRequestGiftBagInfo()
+        // {
+        //     M2C_RequestGiftBagInfo response = null;
+        //     response = (M2C_RequestGiftBagInfo)await MessageHelper.SendToServer(new C2M_RequestGiftBagInfo() { });
+        //     if (response != null)
+        //     {
+        //         if (response.Error == ErrorCode.ERR_Success)
+        //         {
+        //             for (int i = 0; i < response.ks.Count; i++)
+        //             {
+        //                 ShopDataManager.Instance.UpdateGiftData(response.ks[i], response.vs[i]);
+        //             }
+        //         }
+        //     }
+        // }
+        // public static async ETTask<bool> ReqBuyGiftBag(int giftId)
+        // {
+        //     M2C_BuyGiftBag response = null;
+        //     response = (M2C_BuyGiftBag)await MessageHelper.SendToServer(new C2M_BuyGiftBag() { GiftBagId = giftId });
+        //     if (response != null)
+        //     {
+        //         if (response.Error == ErrorCode.ERR_Success)
+        //         {
+        //             ShopDataManager.Instance.UpdateGiftData(response.GiftBagId, response.BuyTimes);
+        //             BonusController.TryShowBonusList(GiftBagCfgArray.Instance.GetCfg(response.GiftBagId).itemsArr);
+        //             EventAgent.DispatchEvent(ConstMessage.BUY_GIFT_SUCCESS);
+        //             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+        //             return true;
+        //         }
+        //     }
+        //     return false;
+        // }
+        // public static async ETTask ReqExchangeInfo()
+        // {
+        //     M2C_RequestShopExchangeInfo response = null;
+        //     response = (M2C_RequestShopExchangeInfo)await MessageHelper.SendToServer(new C2M_RequestShopExchangeInfo() { });
+        //     if (response != null)
+        //     {
+        //         if (response.Error == ErrorCode.ERR_Success)
+        //         {
+        //             for (int i = 0; i < response.ks.Count; i++)
+        //             {
+        //                 ShopDataManager.Instance.UpdateExchangeData(response.ks[i], response.vs[i]);
+        //             }
+        //         }
+        //     }
+        // }
+        // public static async ETTask<bool> ReqExchangeShopItem(int exchangeId, long buyNum)
+        // {
+        //     M2C_ExchangeShopItem response = null;
+        //     response = (M2C_ExchangeShopItem)await MessageHelper.SendToServer(new C2M_ExchangeShopItem() { ExchangeId = exchangeId, Times = (int)buyNum });
+        //     if (response != null)
+        //     {
+        //         if (response.Error == ErrorCode.ERR_Success)
+        //         {
+        //             ShopDataManager.Instance.UpdateExchangeData(response.ExchangeId, response.ExchangedTimes);
+        //             EventAgent.DispatchEvent(ConstMessage.BUY_EXCHANGE_SUCCESS);
+        //             ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(response.ExchangeId);
+        //             BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(cfg.itemId, cfg.num * response.Times));
+        //             return true;
+        //         }
+        //     }
+        //     return false;
+        // }
     }
 }

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

@@ -4,15 +4,46 @@ namespace GFGGame
 {
     public class ShopSProxy
     {
-        public static async ETTask<bool> ShopBuy(int shopType, int buyId, long buyCount)
+        // public static async ETTask<bool> ShopBuy(int shopType, int buyId, long buyCount)
+        // {
+        //     M2C_ShopBuy response = null;
+        //     response = (M2C_ShopBuy)await MessageHelper.SendToServer(new C2M_ShopBuy() { ShopType = shopType, BuyId = buyId, BuyCount = (int)buyCount });
+        //     if (response != null)
+        //     {
+        //         if (response.Error == ErrorCode.ERR_Success)
+        //         {
+        //             // EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
+        //             return true;
+        //         }
+        //     }
+        //     return false;
+        // }
+        public static async ETTask<bool> ReqShopInfo()
         {
-            M2C_ShopBuy response = null;
-            response = (M2C_ShopBuy)await MessageHelper.SendToServer(new C2M_ShopBuy() { ShopType = shopType, BuyId = buyId, BuyCount = (int)buyCount });
+            S2C_RequestShopInfo response = null;
+            response = (S2C_RequestShopInfo)await MessageHelper.SendToServer(new C2S_RequestShopInfo());
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    // EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
+                    for (int i = 0; i < response.ks.Count; i++)
+                    {
+                        ShopDataManager.Instance.UpdateGiftData(response.ks[i], response.vs[i]);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqShopBuy(int buyId, long buyCount)
+        {
+            S2C_ShopBuy response = null;
+            response = (S2C_ShopBuy)await MessageHelper.SendToServer(new C2S_ShopBuy() { BuyId = buyId, Times = (int)buyCount });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ShopDataManager.Instance.UpdateGiftData(response.BuyId, response.TotalTimes);
                     return true;
                 }
             }

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

@@ -27,7 +27,7 @@ namespace GFGGame
             }
             else
             {
-                BuyItemConteoller.Show(itemId, num, ConstBuyType.TYPE_ITEM, 0, onSuccess, showTips, openSource, maxCount);
+                BuyItemConteoller.Show(itemId, num, ConstBuyType.TYPE_ITEM, onSuccess, showTips, openSource, maxCount);
                 BuyItemConteoller.showTxtBuyTips = showTxtBuyTips;
             }
         }
@@ -68,7 +68,7 @@ namespace GFGGame
         {
 
             ItemExchangeCfg currencyRatioCfg = ItemExchangeCfgArray.Instance.GetCfg(ConstItemID.DIAMOND_RED);// GetCurrencyRatioCfgById(ConstItemID.DIAMOND_RED);
-            BuyItemConteoller.Show(currencyRatioCfg.id, value > 0 ? value : 1, ConstBuyType.TYPE_ITEM, 0, onSuccess, true, true);
+            BuyItemConteoller.Show(currencyRatioCfg.id, value > 0 ? value : 1, ConstBuyType.TYPE_ITEM, onSuccess, true, true);
             BuyItemConteoller.showTxtBuyTips = true;
         }
 

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

@@ -174,7 +174,7 @@ namespace GFGGame
             }
             if (_selectedItemId > 0 && _selectedItemCount > 0)
             {
-                ShopViewManager.Instance.BuyItem(_cfgSelected.id, _selectedItemCount, _storeId, _cfgSelected);
+                ShopViewManager.Instance.BuyItem(_cfgSelected.id, _selectedItemCount, ConstBuyType.TYPE_SHOP, _cfgSelected);
             }
 
             Timers.inst.AddUpdate(CheckGuide);
@@ -208,7 +208,7 @@ namespace GFGGame
             int count = _selectedItemId > 0 && _cfgSelected.itemId == _selectedItemId ? _selectedItemCount : INIT_COUNT;
             // BuyItemConteoller.Show(_cfgSelected.itemID, _cfgSelected.costID, INIT_COUNT, _cfgSelected.costNum, count, null, true, false, MAX_COUNT);
             count = Math.Max(1, count);
-            ShopViewManager.Instance.BuyItem(_cfgSelected.id, count, _storeId, _cfgSelected);
+            ShopViewManager.Instance.BuyItem(_cfgSelected.id, count, ConstBuyType.TYPE_SHOP, _cfgSelected);
         }
         private void UpdateItemChange()
         {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyConfirmView.cs

@@ -96,7 +96,7 @@ namespace GFGGame
                     AlertUI.Show(costCfg.name + "不足，是否前往购买？").SetLeftButton(true).SetRightButton(true, "确认", (AlertWindow.AlertCallback)((object data) =>
                     {
                         long costNeedCount = coustNum - ItemDataManager.GetItemNum(costId);
-                        BuyItemConteoller.Show(costId, costNeedCount, ConstBuyType.TYPE_ITEM, 0, null, true, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
+                        BuyItemConteoller.Show(costId, costNeedCount, 0, null, true, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
                     }));
                     OnClickBtnCancel();
                 }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

@@ -97,7 +97,7 @@ namespace GFGGame
         /// <param name="showTips">是否弹购买成功飘字，默认是</param>
         /// <param name="openSource">是否打开来源界面。默认否</param>
         /// <param name="maxCount"></param>
-        public void SetParams(int buyId, long minBuyCount, int buyType, int shopType = 0, Action onSuccess = null, bool showTips = true, bool openSource = false, int maxCount = 9990)
+        public void SetParams(int buyId, long minBuyCount, int buyType, Action onSuccess = null, bool showTips = true, bool openSource = false, int maxCount = 9990)
         {
             _buyId = buyId;
             _itemId = buyId;
@@ -107,7 +107,7 @@ namespace GFGGame
             _openSource = openSource;
             _showTips = showTips;
             _buyType = buyType;
-            _shopType = shopType;
+
             if (buyType == ConstBuyType.TYPE_SHOP)
             {
                 ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(buyId);
@@ -241,13 +241,11 @@ namespace GFGGame
                     bool result = false;
                     switch (_buyType)
                     {
-                        case ConstBuyType.TYPE_NORMAL:
-                            break;
                         case ConstBuyType.TYPE_ITEM:
                             result = await ItemExchangeSProxy.ItemExchange(_buyId, _count);
                             break;
                         case ConstBuyType.TYPE_SHOP:
-                            result = await ShopSProxy.ShopBuy(_shopType, _buyId, _count);
+                            result = await ShopSProxy.ReqShopBuy(_buyId, _count);
                             break;
                     }
                     if (_onSuccess != null)
@@ -280,9 +278,7 @@ namespace GFGGame
             _buyNum = 0;
             if (_buyType == ConstBuyType.TYPE_SHOP)
             {
-
                 ShopDataManager.Instance.GetMoneyIdAndNum(_buyId, (int)count, _shopType, out _costId, out _costNum, out _buyNum);
-
             }
             else if (_buyType == ConstBuyType.TYPE_ITEM)
             {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -38,6 +38,7 @@ namespace GFGGame
             approachView.OnInit(_ui.m_comTipsApproach.target);
 
             _ui.m_comTipsBase.m_listTag.itemRenderer = RenderListTagItem;
+            _ui.m_comTipsBase.m_listItem.itemRenderer = ListItemRenderer;
         }
         protected override void AddEventListener()
         {
@@ -54,6 +55,7 @@ namespace GFGGame
             UpdateBase();
             UpdateScore();
             UpdateTags();
+            UpdateItems();
             UpdateSourec(sourceDatas);
             // this.viewCom.height = _ui.m_grpTips.height;
             // this.viewCom.Center();
@@ -114,6 +116,21 @@ namespace GFGGame
             item.m_txtTagScore.text = itemCfg.tagsArr[index][1].ToString();
             UI_ListTagItem.ProxyEnd();
         }
+        private void UpdateItems()
+        {
+            _ui.m_comTipsBase.m_listItem.visible = itemCfg.itemsArr.Length > 0;
+            _ui.m_comTipsBase.m_listItem.numItems = itemCfg.itemsArr.Length;
+        }
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            ItemData itemData = ItemUtil.createItemData(itemCfg.itemsArr[index]);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).ChangeTxtCountStyle();
+        }
         private void UpdateSourec(object[] sourceDatas)
         {
             _ui.m_comTipsApproach.target.visible = sourceDatas != null;

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

@@ -151,8 +151,8 @@ namespace GFGGame
             }
             (obj.data as ItemView).SetData(itemData);
             (obj.data as ItemView).ChangeTxtCountStyle();
-            (obj.data as ItemView).SetTxtCountScale = 3f;
-            (obj.data as ItemView).SetTxtCountPos(250, 142);
+            // (obj.data as ItemView).SetTxtCountScale = 3f;
+            // (obj.data as ItemView).SetTxtCountPos(250, 142);
         }
         private string GetListGetItemResource(int index)
         {

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/GiftBagBuyView.cs

@@ -1,132 +0,0 @@
-using System.Threading.Tasks;
-using ET;
-using FairyGUI;
-using UI.Store;
-
-namespace GFGGame
-{
-    public class GiftBagBuyView : BaseWindow
-    {
-        private UI_GiftBagBuyUI _ui;
-        private int _giftId;
-        public override void Dispose()
-        {
-
-            if (_ui != null)
-            {
-                _ui.Dispose();
-            }
-            _ui = null;
-            base.Dispose();
-        }
-        protected override void OnHide()
-        {
-            base.OnHide();
-
-        }
-        protected override void OnInit()
-        {
-            base.OnInit();
-            packageName = UI_GiftBagBuyUI.PACKAGE_NAME;
-            _ui = UI_GiftBagBuyUI.Create();
-            this.viewCom = _ui.target;
-            this.viewCom.Center();
-            this.modal = true;
-            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
-
-            _ui.m_btnBuy.onClick.Add(OnBtnBuyClick);
-            _ui.m_list.itemRenderer = ListItemRender;
-        }
-
-        protected override void OnShown()
-        {
-            base.OnShown();
-            _giftId = (int)this.viewData;
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(_giftId);
-            _ui.m_txtName.text = cfg.name;
-            _ui.m_loaIcon.url = ResPathUtil.GetIconPath(cfg.res, "png");//string.Format("ui://RechargeStore/{0}", cfg.res);
-            _ui.m_list.numItems = cfg.itemsArr.Length;
-            _ui.m_c1.selectedIndex = ShopDataManager.Instance.GetGiftStateById(_giftId) ? 0 : 1;
-            if (cfg.lockType == LockType.STORY_LV)
-            {
-                StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
-                _ui.m_txtLock.text = string.Format("通关{0}-{1}解锁", StoryUtil.GetChapterOrder(storyLevelCfg.chapterId), storyLevelCfg.order);
-            }
-            else if (cfg.lockType == LockType.ROLE_LV)
-            {
-                _ui.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv);
-            }
-            int buyNum = ShopDataManager.Instance.GetGiftBuyNumById(cfg.id);
-            _ui.m_txtLimit.text = string.Format("{0}({1}/{2})", ShopDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
-            // if (cfg.refreshType == RefreshType.NONE) _ui.m_txtLimit.text = "永久限购";
-            _ui.m_txtEndTime.text = ShopDataManager.Instance.GetEndTime(cfg.id);
-            _ui.m_grpEndTime.visible = cfg.endTime != "";
-
-            _ui.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
-            if (cfg.price > 0 && cfg.costType != CostType.FREE)
-            {
-                _ui.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
-                _ui.m_grpIcon.visible = true;
-                _ui.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
-
-                if (cfg.costType == CostType.RMB)
-                {
-                    _ui.m_loaPriceIcon.visible = false;
-                    _ui.m_txtIcon.visible = true;
-                    _ui.m_txtIcon.text = "￥";
-                }
-                else
-                {
-                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
-                    _ui.m_loaPriceIcon.url = ResPathUtil.GetIconPath(itemCfg);
-                    _ui.m_loaPriceIcon.visible = true;
-                    _ui.m_txtIcon.visible = false;
-                }
-            }
-            else
-            {
-                _ui.m_grpIcon.visible = false;
-                _ui.m_grpOriginalPrice.visible = false;
-                _ui.m_txtPrice.text = "免费";
-            }
-        }
-
-
-
-        private void ListItemRender(int index, GObject item)
-        {
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(_giftId);
-            ItemData itemData = ItemUtil.createItemData(cfg.itemsArr[index]);
-            if (item.data == null)
-            {
-                item.data = new ItemView(item as GComponent);
-            }
-            (item.data as ItemView).SetData(itemData);
-        }
-        private async void OnBtnBuyClick()
-        {
-
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(_giftId);
-            if (cfg.costType == CostType.ITEM)
-            {
-                long hasNum = ItemDataManager.GetItemNum(cfg.costId);
-                if (hasNum < cfg.price)
-                {
-                    PromptController.Instance.ShowFloatTextPrompt("道具不足");
-                    return;
-                }
-            }
-            bool result = await RechargeSProxy.ReqBuyGiftBag(_giftId);
-            if (result)
-            {
-                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
-                this.Hide();
-                if (cfg.costType == CostType.RMB)
-                {
-
-                    PromptController.Instance.ShowFloatTextPrompt("虚拟充值购买成功");
-                }
-            }
-        }
-    }
-}

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b5a6d93f7f1ca1f44940bd33da16774e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,127 @@
+using System.Threading.Tasks;
+using ET;
+using FairyGUI;
+using UI.Store;
+
+namespace GFGGame
+{
+    public class GiftBagBuyView : BaseWindow
+    {
+        // private UI_GiftBagBuyUI _ui;
+        // private int _goodsId;
+        // public override void Dispose()
+        // {
+
+        //     if (_ui != null)
+        //     {
+        //         _ui.Dispose();
+        //     }
+        //     _ui = null;
+        //     base.Dispose();
+        // }
+        // protected override void OnHide()
+        // {
+        //     base.OnHide();
+
+        // }
+        // protected override void OnInit()
+        // {
+        //     base.OnInit();
+        //     packageName = UI_GiftBagBuyUI.PACKAGE_NAME;
+        //     _ui = UI_GiftBagBuyUI.Create();
+        //     this.viewCom = _ui.target;
+        //     this.viewCom.Center();
+        //     this.modal = true;
+        //     viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+        //     _ui.m_btnBuy.onClick.Add(OnBtnBuyClick);
+        //     _ui.m_list.itemRenderer = ListItemRender;
+        // }
+
+        // protected override void OnShown()
+        // {
+        //     base.OnShown();
+        //     _goodsId = (int)this.viewData;
+        //     ShopCfg cfg = ShopCfgArray.Instance.GetCfg(_goodsId);
+        //     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
+        //     _ui.m_txtName.text = itemCfg.name;
+        //     _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);//string.Format("ui://RechargeStore/{0}", cfg.res);
+        //     _ui.m_list.numItems = itemCfg.itemsArr.Length;
+        //     _ui.m_c1.selectedIndex = ShopDataManager.Instance.GetShopGoodsStateById(_goodsId) ? 0 : 1;
+        //     _ui.m_txtLock.text = ShopDataManager.Instance.GetShopGoodsStateTips(cfg.id);
+
+        //     int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(cfg.id);
+        //     _ui.m_txtLimit.text = string.Format("{0}({1}/{2})", ShopDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
+        //     // if (cfg.refreshType == RefreshType.NONE) _ui.m_txtLimit.text = "永久限购";
+        //     _ui.m_txtEndTime.text = ShopDataManager.Instance.GetEndTime(cfg.id);
+        //     _ui.m_grpEndTime.visible = cfg.endTime != "";
+
+        //     _ui.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
+        //     if (cfg.price > 0 && cfg.costType != CostType.FREE)
+        //     {
+        //         _ui.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
+        //         _ui.m_grpIcon.visible = true;
+        //         _ui.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
+
+        //         if (cfg.costType == CostType.RMB)
+        //         {
+        //             _ui.m_loaPriceIcon.visible = false;
+        //             _ui.m_txtIcon.visible = true;
+        //             _ui.m_txtIcon.text = "￥";
+        //         }
+        //         else
+        //         {
+        //             ItemCfg itemCostCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
+        //             _ui.m_loaPriceIcon.url = ResPathUtil.GetIconPath(itemCostCfg);
+        //             _ui.m_loaPriceIcon.visible = true;
+        //             _ui.m_txtIcon.visible = false;
+        //         }
+        //     }
+        //     else
+        //     {
+        //         _ui.m_grpIcon.visible = false;
+        //         _ui.m_grpOriginalPrice.visible = false;
+        //         _ui.m_txtPrice.text = "免费";
+        //     }
+        // }
+
+
+
+        // private void ListItemRender(int index, GObject item)
+        // {
+        //     ShopCfg cfg = ShopCfgArray.Instance.GetCfg(_goodsId);
+        //     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
+        //     ItemData itemData = ItemUtil.createItemData(itemCfg.itemsArr[index]);
+        //     if (item.data == null)
+        //     {
+        //         item.data = new ItemView(item as GComponent);
+        //     }
+        //     (item.data as ItemView).SetData(itemData);
+        // }
+        // private async void OnBtnBuyClick()
+        // {
+        //     ShopCfg cfg = ShopCfgArray.Instance.GetCfg(_goodsId);
+        //     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
+        //     if (cfg.costType == CostType.ITEM)
+        //     {
+        //         long hasNum = ItemDataManager.GetItemNum(cfg.costId);
+        //         if (hasNum < cfg.price)
+        //         {
+        //             PromptController.Instance.ShowFloatTextPrompt("道具不足");
+        //             return;
+        //         }
+        //     }
+        //     bool result = await RechargeSProxy.ReqBuyGiftBag(_goodsId);
+        //     if (result)
+        //     {
+        //         LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+        //         this.Hide();
+        //         if (cfg.costType == CostType.RMB)
+        //         {
+
+        //             PromptController.Instance.ShowFloatTextPrompt("虚拟充值购买成功");
+        //         }
+        //     }
+        // }
+    }
+}

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

@@ -2,14 +2,14 @@ using System;
 using ET;
 using FairyGUI;
 using UI.CommonGame;
-// using UI.RechargeStore;
 
 namespace GFGGame
 {
     public class ItemExchangeView : BaseWindow
     {
         private UI_ItemExchangeUI _ui;
-        private int _exchangeId;
+        private ShopCfg _shopCfg;
+        private int _goodIds;
         private long _buyCount = 0;
         private long _maxCanBuy = 0;
         public override void Dispose()
@@ -41,25 +41,37 @@ namespace GFGGame
             _ui.m_btnMax.target.onClick.Add(OnBtnAllClick);
             _ui.m_btnConfirm.onClick.Add(OnBtnExchangeClick);
             _ui.m_btnCancle.onClick.Add(this.Hide);
+
+            _ui.m_listItem.itemRenderer = ListItemRenderer;
         }
 
         protected override void OnShown()
         {
             base.OnShown();
 
-            _exchangeId = (int)this.viewData;
-            ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(_exchangeId);
+            _goodIds = (int)this.viewData;
+            _shopCfg = ShopCfgArray.Instance.GetCfg(_goodIds);
 
             _buyCount = 1;
-            long curMoneyCanBuy = ItemDataManager.GetItemNum(cfg.costId) / cfg.costNum;
-            if (cfg.maxLimit == 0)
+            if (_shopCfg.costType == CostType.RMB)
             {
-                _maxCanBuy = Math.Min(curMoneyCanBuy, GameConst.MAX_COUNT_TO_BUY_ITEMS);
+                _maxCanBuy = 1;
             }
             else
             {
-                int lastBuyCount = cfg.maxLimit - ShopDataManager.Instance.GetExchangeBuyNumById(cfg.id);//剩余购买次数
-                _maxCanBuy = Math.Min(curMoneyCanBuy, lastBuyCount);
+                long curMoneyCanBuy = ItemDataManager.GetItemNum(_shopCfg.costId) / _shopCfg.price;
+
+                if (_shopCfg.maxBuyNum == 0)
+                {
+
+                    _maxCanBuy = Math.Min(curMoneyCanBuy, GameConst.MAX_COUNT_TO_BUY_ITEMS);
+                }
+                else
+                {
+                    int lastBuyCount = _shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(_shopCfg.id);//剩余购买次数
+                    _maxCanBuy = Math.Min(curMoneyCanBuy, lastBuyCount);
+                }
+
             }
             _maxCanBuy = Math.Max(1, _maxCanBuy);
             _ui.m_txtExchangeCount.visible = true;
@@ -69,26 +81,35 @@ namespace GFGGame
         }
         private void UpdateStaticView()
         {
-            ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(_exchangeId);
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_shopCfg.itemId);
             _ui.m_txtName.text = itemCfg.name;
             _ui.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
-            _ui.m_txtOwned.SetVar("count", ItemDataManager.GetItemNum(cfg.itemId).ToString()).FlushVars();
+            _ui.m_txtOwned.SetVar("count", ItemDataManager.GetItemNum(_shopCfg.itemId).ToString()).FlushVars();
             _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             _ui.m_loaRarity.visible = false;
-            if (ItemUtilCS.IsDressUpItem(cfg.itemId))
+            if (ItemUtilCS.IsDressUpItem(_shopCfg.itemId))
             {
                 _ui.m_loaRarity.visible = true;
-                RarityIconController.UpdateRarityIcon(_ui.m_loaRarity, cfg.itemId, false);
+                RarityIconController.UpdateRarityIcon(_ui.m_loaRarity, _shopCfg.itemId, false);
+            }
+            _ui.m_listItem.numItems = itemCfg.itemsArr.Length;
+            _ui.m_listItem.visible = itemCfg.itemsArr.Length > 0;
+        }
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_shopCfg.itemId);
+            ItemData itemData = ItemUtil.createItemData(itemCfg.itemsArr[index]);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
             }
+            (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).ChangeTxtCountStyle();
         }
         private void UpdateView()
         {
-
-            ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(_exchangeId);
-            _ui.m_txtExchangeCount.text = string.Format("x{0}", cfg.num * _buyCount);
-
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
+            _ui.m_txtExchangeCount.text = string.Format("x{0}", _shopCfg.itemNum * _buyCount);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_shopCfg.itemId);
             _ui.m_txtCostCount.text = _buyCount.ToString();
             _ui.m_btnMinus.m_c1.selectedIndex = _buyCount == 1 ? 1 : 0;
             _ui.m_btnMinus.target.touchable = _buyCount == 1 ? false : true;
@@ -100,7 +121,7 @@ namespace GFGGame
 
             _ui.m_txtShow.text = "选择购买数量";
             _ui.m_txtTips.text = string.Format("确定购买{0}个{1}？", _buyCount, itemCfg.name);
-            ItemUtil.UpdateItemNeedNum(_ui.m_comCost.target, cfg.costId, (int)_buyCount * cfg.costNum);
+            ItemUtil.UpdateItemNeedNum(_ui.m_comCost.target, _shopCfg.costId, (int)_buyCount * _shopCfg.price);
         }
 
 
@@ -131,14 +152,14 @@ namespace GFGGame
         }
         private async void OnBtnExchangeClick()
         {
-            ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(_exchangeId);
+            ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(_goodIds);
             if (ItemDataManager.GetItemNum(cfg.costId) < cfg.costNum)
             {
                 PromptController.Instance.ShowFloatTextPrompt("道具不足");
                 return;
             }
 
-            bool result = await RechargeSProxy.ReqExchangeShopItem(_exchangeId, _buyCount);
+            bool result = await ShopSProxy.ReqShopBuy(_goodIds, _buyCount);
             if (result)
             {
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);

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

@@ -0,0 +1,72 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class StoreArenaView : BaseWindow
+    {
+        private UI_StoreExchangeUI _ui;
+        private List<ShopCfg> _shopCfgs;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoreExchangeUI.PACKAGE_NAME;
+            _ui = UI_StoreExchangeUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            int menu2 = (int)this.viewData;
+            _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_ARENA, menu2);
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            ShopCfg shopCfg = _shopCfgs[index];
+            ShopViewManager.Instance.UptadeItem(obj, shopCfg);
+
+            UI_ListShopItem item = UI_ListShopItem.Proxy(obj);
+
+            ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.menu2 == 0 || shopCfg.menu2 == ArenaDataManager.Instance.SeasonId ? shopCfg.costId : shopCfg.oldSeasonCostId);
+            item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(costItemCfg.res);
+
+            UI_ListShopItem.ProxyEnd();
+        }
+    }
+}

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

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

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

@@ -0,0 +1,65 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class StoreChargeAddUpView : BaseWindow
+    {
+        private UI_StoreGiftBagUI _ui;
+        private List<ShopCfg> _shopCfgs;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoreGiftBagUI.PACKAGE_NAME;
+            _ui = UI_StoreGiftBagUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            int menu2 = (int)this.viewData;
+            _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            ShopCfg shopCfg = _shopCfgs[index];
+            ShopViewManager.Instance.UptadeItem(obj, shopCfg);
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs → GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeView.cs

@@ -6,9 +6,9 @@ using ET;
 
 namespace GFGGame
 {
-    public class ChargeStoreView : BaseWindow
+    public class StoreChargeView : BaseWindow
     {
-        private UI_ChargeUI _ui;
+        private UI_StoreChargeUI _ui;
         private List<ShopCfg> _shopCfgs;
 
         public override void Dispose()
@@ -25,8 +25,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ChargeUI.PACKAGE_NAME;
-            _ui = UI_ChargeUI.Create();
+            packageName = UI_StoreChargeUI.PACKAGE_NAME;
+            _ui = UI_StoreChargeUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
             this.clickBlankToClose = false;
@@ -36,6 +36,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateVipProgressCom);
 
         }
         protected override void OnShown()
@@ -43,9 +44,13 @@ namespace GFGGame
             base.OnShown();
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE);
             _ui.m_list.numItems = _shopCfgs.Count;
-
+            UpdateVipProgressCom();
         }
 
+        private void UpdateVipProgressCom()
+        {
+            ShopViewManager.Instance.UpdateVipProgressCom(_ui.m_comVipLv.target);
+        }
         protected override void OnHide()
         {
             base.OnHide();
@@ -53,30 +58,23 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateVipProgressCom);
         }
 
         private void ListItemRenderer(int index, GObject obj)
         {
-            ShopCfg itemData = _shopCfgs[index];
+            ShopCfg shopCfg = _shopCfgs[index];
             UI_ListChargeItem item = UI_ListChargeItem.Proxy(obj);
             item.m_btnBuy.m_c1.selectedIndex = 1;
-            item.m_btnBuy.m_txtTitle.text = itemData.price.ToString();
+            item.m_btnBuy.m_txtTitle.text = shopCfg.price.ToString();
             if (item.target.data == null)
             {
                 item.target.onClick.Add(OnClickBtnBuy);
-                // item.target.onClick.Add(() =>
-                // {
-                //     if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
-                //     {
-                //         RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
-                //         LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
-                //     }
-                // });
             }
             item.target.data = index;
-            item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.itemName);
-            item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", itemData.itemNum, itemData.itemName);
-            bool isDouble = ShopDataManager.Instance.GetRechargeBuyNumById(itemData.id) < itemData.doubleTimes;
+            item.m_txtName.text = string.Format("{0}{1}", shopCfg.itemNum, shopCfg.itemName);
+            item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", shopCfg.itemNum, shopCfg.itemName);
+            bool isDouble = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) < shopCfg.doubleTimes;
             item.m_imgDouble.visible = isDouble;
             item.m_txtDesc.visible = isDouble;
             item.m_icon.url = "ui://Store/sc_zizhuan_" + (index + 1);
@@ -91,7 +89,8 @@ namespace GFGGame
             ShopCfg itemData = _shopCfgs[index];
             if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
             {
-                RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
+                // RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
+                ShopSProxy.ReqShopBuy(itemData.id, 1).Coroutine();
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
             }
         }

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

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

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

@@ -0,0 +1,65 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class StoreExchangeView : BaseWindow
+    {
+        private UI_StoreExchangeUI _ui;
+        private List<ShopCfg> _shopCfgs;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoreExchangeUI.PACKAGE_NAME;
+            _ui = UI_StoreExchangeUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            int menu2 = (int)this.viewData;
+            _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, menu2);
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            ShopCfg shopCfg = _shopCfgs[index];
+            ShopViewManager.Instance.UptadeItem(obj, shopCfg);
+        }
+    }
+}

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

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

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

@@ -0,0 +1,65 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class StoreGiftBagView : BaseWindow
+    {
+        private UI_StoreGiftBagUI _ui;
+        private List<ShopCfg> _shopCfgs;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoreGiftBagUI.PACKAGE_NAME;
+            _ui = UI_StoreGiftBagUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            int menu2 = (int)this.viewData;
+            _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            ShopCfg shopCfg = _shopCfgs[index];
+            ShopViewManager.Instance.UptadeItem(obj, shopCfg);
+        }
+    }
+}

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

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

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

@@ -55,7 +55,7 @@ namespace GFGGame
             _arenaSubTab.Add(new List<string>() { arenaTab.subTabArr[0][0], arenaTab.subTabArr[0][1], arenaTab.subTabArr[0][2] });
             for (int i = ArenaDataManager.Instance.SeasonId; i > 0; i--)
             {
-                _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), i.ToString(), "" });
+                _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), i.ToString(), "StoreArenaView" });
             }
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
@@ -152,13 +152,24 @@ namespace GFGGame
             GObject obj = context.data as GObject;
             int index = (int)obj.data;
             if (index < 0) return;
+            OnListSubTabChange(index);
         }
         private void OnListSubTabChange(int index)
         {
 
             StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(_curTabIndex);
-
-            string viewName = tabCfg.subTabArr[index][2];
+            string viewName = "";
+            int menu2 = 0;
+            if (tabCfg.functionId == ConstFunctionId.STORE_ARENA)
+            {
+                menu2 = int.Parse(_arenaSubTab[index][1]);
+                viewName = _arenaSubTab[index][2];
+            }
+            else
+            {
+                menu2 = int.Parse(tabCfg.subTabArr[index][1]);
+                viewName = tabCfg.subTabArr[index][2];
+            }
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(viewName))
             {
                 _ui.m_listSubTab.selectedIndex = _curSubTabIndex;
@@ -167,7 +178,7 @@ namespace GFGGame
             ViewManager.Hide(_curViewName);
             if (!string.IsNullOrEmpty(viewName) && viewName != "“”")
             {
-                ViewManager.Show("GFGGame." + viewName, index);
+                ViewManager.Show("GFGGame." + viewName, menu2);
             }
             _curSubTabIndex = index;
             _curViewName = "GFGGame." + viewName;