Merge branch 'master' into yujie

* master: (29 commits)
  导表
  商城
  商城
  充值
  充值
  导表
  公用机提交
  通用限制
  商城
  商城
  通用限制
  公用机提交
  公用机提交
  卡牌升星奖励
  雅集ui调整
  商城
  无升星奖励词牌不显示领奖按钮
  适配
  公用机提交
  替换资源
  ...

# Conflicts:
#	FGUIProject/assets/RechargeStore/package.xml
#	GameClient/Assets/Game/HotUpdate/Data/DailyTaskDataManager.cs
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
#	GameClient/Assets/ResIn/UI/League/League_fui.bytes

FGUIProject/assets/Card/CardDetailUI.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n10_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    <loader id="n10_gbqo" name="loaBg" xy="540,720" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,bottom-bottom"/>
     </loader>
+    <image id="n11_fqor" name="n11" src="fqortln" fileName="images/cp_yeqian_bg_shang.png" xy="0,0">
+      <relation target="" sidePair="top-top"/>
+    </image>
     <image id="n7_pq5x" name="n7" src="qkjsbu" fileName="imagesNew/TAB_DividingLine.png" xy="54,300">
       <relation target="" sidePair="center-center,top-top"/>
     </image>

FGUIProject/assets/Card/CardSkillUI.xml

@@ -18,7 +18,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n15_rhha" name="comConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="337,856" size="289,42" group="n17_mza1"/>
+    <component id="n15_rhha" name="comConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="336,856" pivot="0.5,0" size="289,42" group="n17_mza1" controller="c1,1"/>
     <component id="n16_rhha" name="btnUpLv" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="374,920" group="n17_mza1">
       <Button title="升级"/>
     </component>

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,7 +2,7 @@
 <component size="1080,831" opaque="false">
   <controller name="ctrlFullStar" pages="0,,1," selected="0"/>
   <controller name="ctrlFullLv" pages="0,,1," selected="0"/>
-  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="0"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="1"/>
   <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <image id="n70_lc71" name="n70" src="qkjsbm" fileName="imagesNew/dikuang_back.png" xy="0,-212" size="1080,1039" group="n115_o9gh"/>
@@ -12,7 +12,7 @@
     <text id="n102_qkjs" name="txtName1" xy="199,156" pivot="0.5,0" anchor="true" size="10,62" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#915e15" autoClearText="true" text=""/>
     <text id="n103_qkjs" name="txtName2" xy="195,210" pivot="0.5,0" anchor="true" size="44,54" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#915e15" autoClearText="true" text="婵"/>
     <text id="n104_qkjs" name="txtName3" xy="237,207" pivot="0.5,0" anchor="true" size="50,61" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#915e15" autoClearText="true" text="娟"/>
-    <text id="n105_qkjs" name="txtName4" xy="256,201" size="58,72" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="54" color="#915e15" autoClearText="true" text="娟"/>
+    <text id="n105_qkjs" name="txtName4" xy="256,201" size="58,71" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="54" color="#915e15" autoClearText="true" text="娟"/>
     <image id="n107_qkjs" name="n107" src="qkjsbc" fileName="imagesNew/card_DividingLine_name.png" xy="119,212" size="56,66" group="n106_qkjs"/>
     <group id="n106_qkjs" name="grpName" xy="106,129" size="208,149" group="n115_o9gh"/>
     <component id="n36_842s" name="barLv" src="842s6q" fileName="components/ProgressBar1.xml" xy="84,684" size="912,32" group="n38_842s">
@@ -59,7 +59,7 @@
     <component id="n52_l2by" name="btnUpStar" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="706,6" size="374,342" group="n79_v461">
       <Button title="升星" icon="ui://7l6lvkayqkjsb2"/>
     </component>
-    <component id="n51_l2by" name="comStarCousumeGold" src="qkjstlh" fileName="components/ComCost.xml" pkg="eg2y0ldp" xy="754,278" size="289,46" group="n79_v461"/>
+    <component id="n51_l2by" name="comStarCousumeGold" src="qkjstlh" fileName="components/ComCost.xml" pkg="eg2y0ldp" xy="754,278" size="289,46" group="n79_v461" controller="c1,1"/>
     <text id="n108_qkjs" name="txtTips" xy="796,279" pivot="0.5,0" size="205,46" group="n79_v461" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716660" align="center" vAlign="middle" ubb="true" autoClearText="true" text="需要达到15级"/>
     <list id="n47_wr9a" name="listStarConsume" xy="624,511" pivot="0.5,0" size="427,182" group="n79_v461" scale="0.8,0.8" layout="row" colGap="60" defaultItem="ui://7l6lvkaywr9a82" align="center">
       <item/>
@@ -80,7 +80,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n55_l2by" name="grpStar" xy="99,6" size="981,714" group="n115_o9gh" advanced="true">
+    <group id="n55_l2by" name="grpStar" xy="99,6" size="980,714" group="n115_o9gh" advanced="true">
       <gearDisplay controller="ctrlTab" pages="1"/>
     </group>
     <list id="n77_rhha" name="listSkill" xy="50,423" size="1006,289" group="n113_o9gh" layout="row" overflow="hidden" lineGap="25" colGap="170" defaultItem="ui://7l6lvkayrhha9k" align="center">
@@ -103,11 +103,11 @@
       <gearDisplay controller="ctrlTab" pages="2"/>
     </group>
     <component id="n17_ojlz" name="btnLv" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="75,331" size="290,70" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="0"/>
+      <Button controller="ctrlTab" page="0"/>
       <property target="title" propertyId="0" value="升级"/>
     </component>
     <component id="n18_ojlz" name="btnStar" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="395,331" size="290,70" group="n22_842s">
-      <Button controller="ctrlTab" page="1"/>
+      <Button checked="true" controller="ctrlTab" page="1"/>
       <property target="title" propertyId="0" value="升星"/>
     </component>
     <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="715,331" size="290,70" group="n22_842s">

FGUIProject/assets/Card/components/ComStarConsume.xml

@@ -4,12 +4,12 @@
     <loader id="n35_842s" name="n35" xy="0,0" size="180,180" url="ui://7l6lvkayqkjsbs" fill="scaleFree"/>
     <image id="n43_qkjs" name="n43" src="qkjsb7" fileName="imagesNew/bk_SKillItem.png" xy="13,15"/>
     <loader id="n36_842s" name="loaItem" xy="34,37" size="104,104" url="ui://eg2y0ldppq5x62" fill="scaleFree"/>
-    <image id="n33_842s" name="n33" src="qkjsb5" fileName="imagesNew/dikuang_SkillLevel.png" xy="24,139" size="131,30"/>
-    <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" xy="124,131"/>
-    <text id="n39_a713" name="txtHasCount" xy="50,130" size="35,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" ubb="true" text="12"/>
-    <text id="n41_wr9a" name="n41" xy="81,130" size="18,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" text="/"/>
-    <text id="n38_a713" name="txtNeedCount" xy="95,130" size="35,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" ubb="true" text="66"/>
-    <group id="n42_94m1" name="n42" xy="50,130" size="80,44" advanced="true" layout="hz" colGap="-4" excludeInvisibles="true">
+    <image id="n33_842s" name="n33" src="qkjsb5" fileName="imagesNew/dikuang_SkillLevel.png" xy="19,139" pivot="0.5,0" size="140,30"/>
+    <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" xy="135,130"/>
+    <text id="n39_a713" name="txtHasCount" xy="34,130" size="35,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" ubb="true" text="20"/>
+    <text id="n41_wr9a" name="n41" xy="65,130" size="18,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" text="/"/>
+    <text id="n38_a713" name="txtNeedCount" xy="79,130" size="66,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" ubb="true" text="6600"/>
+    <group id="n42_94m1" name="n42" xy="34,130" size="111,44" advanced="true" layout="hz" colGap="-4" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

FGUIProject/assets/Card/package.xml

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

FGUIProject/assets/League/LeagueChangeNameUI.xml

@@ -23,7 +23,9 @@
       <item/>
       <item/>
     </list>
-    <text id="n6_rv09" name="n6" xy="356,344" size="368,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#b4905d" align="center" text="请输入您想要修改的雅集名字"/>
+    <text id="n6_rv09" name="n6" xy="356,344" size="368,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#b4905d" align="center" text="请输入您想要修改的雅集名字">
+      <gearDisplay controller="c1" pages="1"/>
+    </text>
     <image id="n13_wm60" name="n13" src="a0cf2g" fileName="images/lm_sousuok.png" xy="178,412" group="n7_rv09"/>
     <text id="n5_rv09" name="txtName" xy="205,417" size="589,42" group="n7_rv09" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#775a33" autoSize="none" text="" input="true" prompt="[color=#A7957E]输入雅集名字，最多七个字[/color]" maxLength="7"/>
     <group id="n7_rv09" name="n7" xy="178,412" size="705,53" advanced="true">

FGUIProject/assets/League/LeagueGiftUI.xml

@@ -12,6 +12,7 @@
     <image id="n2_pvb4" name="n2" src="9jv669" fileName="images/biaotizi_11.png" xy="203,222" size="673,62"/>
     <image id="n18_9jv6" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,1649">
       <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="bottom-bottom"/>
     </image>
     <image id="n3_pvb4" name="n3" src="9jv661" fileName="images/lm_yeqian_db2.png" xy="618,91" size="293,56" group="n6_pvb4"/>
     <component id="n4_pvb4" name="n4" src="9jv677" fileName="components/Button81.xml" xy="613,88" group="n6_pvb4">

FGUIProject/assets/League/LeagueUI.xml

@@ -4,7 +4,6 @@
     <loader id="n0_u2u3" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n23_o9gh" name="n23" src="o9gh45" fileName="images/lm_zjm_lmmzkuang.png" xy="204,315"/>
     <component id="n1_u2u3" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
@@ -17,23 +16,25 @@
     <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="346,81" controller="c1,0">
       <Button title="雅集建设"/>
     </component>
-    <text id="n30_gfx4" name="txtLowKeep" xy="777,160" pivot="1,0" size="255,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#ff0000" align="right" text="已连续低维护：1天"/>
-    <text id="n10_u2u3" name="txtUnionName" xy="250,317" pivot="0.5,0" size="212,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff6dc" align="center" autoClearText="true" text="联盟名字7个字"/>
-    <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="109,267"/>
-    <image id="n25_o9gh" name="n25" src="o9gh47" fileName="images/lm_zjm_gonggao.png" xy="599,308" size="444,136" group="n26_o9gh">
+    <text id="n30_gfx4" name="txtLowKeep" xy="771,32" pivot="1,0" size="255,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#ff0000" align="right" text="已连续低维护：1天"/>
+    <image id="n23_o9gh" name="n23" src="o9gh45" fileName="images/lm_zjm_lmmzkuang.png" xy="139,261" group="n31_fqor"/>
+    <text id="n10_u2u3" name="txtUnionName" xy="185,263" pivot="0.5,0" size="212,44" group="n31_fqor" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff6dc" align="center" autoClearText="true" text="联盟名字7个字"/>
+    <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="44,213" group="n31_fqor"/>
+    <group id="n31_fqor" name="n31" xy="44,213" size="405,136"/>
+    <image id="n25_o9gh" name="n25" src="o9gh47" fileName="images/lm_zjm_gonggao.png" xy="599,253" size="444,136" group="n26_o9gh">
       <relation target="n15_u2u3" sidePair="height-height"/>
     </image>
-    <image id="n24_o9gh" name="n24" src="o9gh44" fileName="images/lm_zjm_mzkuang.png" xy="784,283" group="n26_o9gh"/>
-    <image id="n27_o9gh" name="n27" src="o9gh4a" fileName="images/lm_zjm_chkuang.png" xy="813,263" group="n26_o9gh"/>
-    <component id="n13_u2u3" name="comHead" src="o9ghtlo" fileName="components/ComHead1.xml" pkg="eg2y0ldp" xy="731,246" group="n26_o9gh" scale="0.4,0.4"/>
-    <component id="n17_u2u3" name="btnChangeNotice" src="rv091l" fileName="components/Button10.xml" xy="965,373" size="66,66" group="n26_o9gh">
+    <image id="n24_o9gh" name="n24" src="o9gh44" fileName="images/lm_zjm_mzkuang.png" xy="784,228" group="n26_o9gh"/>
+    <image id="n27_o9gh" name="n27" src="o9gh4a" fileName="images/lm_zjm_chkuang.png" xy="813,208" group="n26_o9gh"/>
+    <component id="n13_u2u3" name="comHead" src="o9ghtlo" fileName="components/ComHead1.xml" pkg="eg2y0ldp" xy="731,191" group="n26_o9gh" scale="0.4,0.4"/>
+    <component id="n17_u2u3" name="btnChangeNotice" src="rv091l" fileName="components/Button10.xml" xy="965,318" size="66,66" group="n26_o9gh">
       <relation target="n25_o9gh" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://tw70qm9dwm6034"/>
     </component>
-    <text id="n14_u2u3" name="txtLeaderName" xy="815,287" size="162,34" group="n26_o9gh" font="ui://eg2y0ldpa0cftkz" fontSize="24" color="#923c1a" autoClearText="true" text="会长名字7个字"/>
-    <text id="n15_u2u3" name="txtNotice" xy="617,339" size="396,69" group="n26_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="-4" autoSize="height" autoClearText="true" text="联盟公告联盟公告联盟公盟公联盟联盟公告联盟公告联盟"/>
-    <text id="n29_o9gh" name="n29" xy="819,260" size="39,26" group="n26_o9gh" font="ui://eg2y0ldpa0cftkz" fontSize="18" color="#fffbed" text="社长"/>
-    <group id="n26_o9gh" name="n26" xy="599,246" size="444,230"/>
+    <text id="n14_u2u3" name="txtLeaderName" xy="815,232" size="162,34" group="n26_o9gh" font="ui://eg2y0ldpa0cftkz" fontSize="24" color="#923c1a" autoClearText="true" text="会长名字7个字"/>
+    <text id="n15_u2u3" name="txtNotice" xy="617,284" size="396,69" group="n26_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="-4" autoSize="height" autoClearText="true" text="联盟公告联盟公告联盟公盟公联盟联盟公告联盟公告联盟"/>
+    <text id="n29_o9gh" name="n29" xy="819,205" size="39,26" group="n26_o9gh" font="ui://eg2y0ldpa0cftkz" fontSize="18" color="#fffbed" text="社长"/>
+    <group id="n26_o9gh" name="n26" xy="599,191" size="444,230"/>
     <component id="n7_u2u3" name="btnPray" src="u2u314" fileName="components/ButtonModle6.xml" xy="70,446" group="n9_u2u3"/>
     <component id="n3_u2u3" name="btnSkill" src="u2u3u" fileName="components/ButtonModle2.xml" xy="343,669" group="n9_u2u3"/>
     <component id="n4_u2u3" name="btnGift" src="u2u3y" fileName="components/ButtonModle3.xml" xy="755,894" group="n9_u2u3"/>

FGUIProject/assets/League/components/Button14.xml

@@ -6,7 +6,7 @@
     <remark page="1" value="可点击"/>
   </controller>
   <displayList>
-    <image id="n7_wm60" name="n7" src="wm603g" fileName="images/lm_an__3weixuan.png" xy="0,0" pkg="eg2y0ldp">
+    <image id="n7_wm60" name="n7" src="wm603g" fileName="imagesNew/lm_an__3weixuan.png" pkg="eg2y0ldp" xy="0,0">
       <gearDisplay controller="touchable" pages="0"/>
     </image>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://eg2y0ldpwm603f" fill="scale" autoSize="true">
@@ -15,7 +15,7 @@
     <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
-    <text id="n5_rv09" name="txtTime" xy="5,61" pivot="0.5,0" size="176,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" text="剩余时间23：59">
+    <text id="n5_rv09" name="txtTime" xy="5,61" pivot="0.5,0" size="176,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" autoClearText="true" text="剩余时间23：59">
       <gearDisplay controller="touchable" pages="0"/>
     </text>
     <component id="n6_a0cf" name="comcost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="27,54">

FGUIProject/assets/RechargeStore/RechargeStoreUI.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
-  <displayList>
-    <loader id="n27_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </loader>
-    <component id="n3_d4iw" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n1_d4iw" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
-    <image id="n15_10not" name="n15" src="dmsi1d" fileName="images/sc_kuangjia_1.png" xy="0,414" size="1080,1506">
-      <relation target="" sidePair="height-height,top-top"/>
-    </image>
-    <component id="n17_10not" name="comTab" src="10not1s" fileName="components/Component1.xml" xy="95,401"/>
-    <text id="n25_t8xr" name="txtRefreshTime" xy="796,480" size="204,44" fontSize="32" color="#b38282" autoClearText="true" text="23小时后刷新">
-      <gearDisplay controller="c1" pages="2"/>
-    </text>
-    <list id="n10_d4iw" name="list" xy="0,472" size="1080,1232" layout="flow_hz" overflow="scroll" scrollBarFlags="64" colGap="22" defaultItem="ui://vlgobc15d4iwr" align="center" scrollItemToViewOnClick="false">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <list id="n23_10not" name="listGift" xy="0,472" size="1080,1232" layout="flow_hz" overflow="scroll" colGap="10" defaultItem="ui://vlgobc1510not1t" align="center">
-      <gearDisplay controller="c1" pages="1"/>
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <list id="n24_10not" name="listExchange" xy="0,526" pivot="1,0" size="1080,1178" layout="flow_hz" overflow="scroll" scrollBarFlags="64" colGap="22" defaultItem="ui://vlgobc15d4iwr" align="center" scrollItemToViewOnClick="false">
-      <gearDisplay controller="c1" pages="2"/>
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <image id="n16_10not" name="n16" src="10not1r" fileName="images/sc_kuangjia_3.png" xy="0,1613">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-    </image>
-  </displayList>
-</component>

FGUIProject/assets/RechargeStore/StoreUI.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <displayList>
-    <loader id="n0_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" group="n3_fqor" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </loader>
-    <component id="n1_fqor" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n3_fqor"/>
-    <component id="n2_fqor" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n3_fqor" controller="c1,10"/>
-    <group id="n3_fqor" name="n3" xy="0,-240" size="1080,2400"/>
-  </displayList>
-</component>

FGUIProject/assets/RechargeStore/components/Component1.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="890,70">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
-  <displayList>
-    <component id="n17_10not" name="btn0" src="dmsi1q" fileName="components/Button2.xml" xy="0,0">
-      <Button checked="true" icon="ui://vlgobc15dmsi17" selectedIcon="ui://vlgobc15dmsi16" controller="c1" page="0"/>
-      <property target="loaMascot" propertyId="1" value="ui://vlgobc15iftftaa"/>
-    </component>
-    <component id="n18_10not" name="btn1" src="dmsi1q" fileName="components/Button2.xml" xy="314,0">
-      <Button icon="ui://vlgobc15dmsi19" selectedIcon="ui://vlgobc15dmsi18" controller="c1" page="1"/>
-      <property target="loaMascot" propertyId="1" value="ui://vlgobc15iftftab"/>
-    </component>
-    <component id="n19_10not" name="btn2" src="dmsi1q" fileName="components/Button2.xml" xy="628,0">
-      <Button icon="ui://vlgobc15dmsi1b" selectedIcon="ui://vlgobc15dmsi1a" controller="c1" page="2"/>
-      <property target="loaMascot" propertyId="1" value="ui://vlgobc15iftftac"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/RechargeStore/components/Component2.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="264,79">
-  <controller name="c1" pages="0,,1," selected="1"/>
-  <displayList>
-    <loader id="n15_iftf" name="loaIcon" xy="88,19" size="60,60" group="n17_iftf" url="ui://eg2y0ldpq08x4" autoSize="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </loader>
-    <image id="n20_qqat" name="n20" src="qqattah" fileName="images/scsc_fuhao.png" xy="88,31" group="n17_iftf">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <group id="n17_iftf" name="n17" xy="88,31" size="40,37" group="n19_iftf" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <text id="n18_iftf" name="txtTitle" xy="128,17" size="64,64" group="n19_iftf" fontSize="48" color="#8b6540" align="center" vAlign="middle" vars="true" singleLine="true" text="60">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-    <group id="n19_iftf" name="n19" xy="88,17" size="104,64" advanced="true" layout="hz" excludeInvisibles="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
-  </displayList>
-</component>

FGUIProject/assets/Store/ComVipLv.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="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"/>
+    <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]级会员"/>
+    <group id="n43_hhx9" name="n43" 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>
+  </displayList>
+</component>

FGUIProject/assets/RechargeStore/ItemExchangeUI.xml → FGUIProject/assets/Store/ItemExchangeUI.xml

@@ -16,7 +16,7 @@
     <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://vlgobc15dmsi1n"/>
+      <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"/>

FGUIProject/assets/Store/RechargeStoreUI.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <displayList>
+    <component id="n32_hhx9" name="n32" src="fqor7x" fileName="StoreUI.xml" xy="0,0"/>
+    <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="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/StoreUI.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" designImageOffsetY="-240">
+  <displayList>
+    <image id="n21_hhx9" name="n21" src="hhx91q" fileName="imagesNew/sc_beijing.png" xy="0,-240"/>
+    <loader id="n0_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <image id="n17_fqor" name="n17" src="fqortb7" fileName="imagesNew/sc_beijing_shang.png" xy="0,0"/>
+    <image id="n14_fqor" name="n14" src="fqortb6" fileName="imagesNew/sc_beijing_hua.png" xy="622,0"/>
+    <image id="n9_fqor" name="n9" src="fqortb3" fileName="imagesNew/sc_line1.png" xy="81,444"/>
+    <component id="n2_fqor" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
+    <component id="n1_fqor" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <image id="n10_fqor" name="n10" src="fqortb2" fileName="imagesNew/sc_line2.png" xy="55,327"/>
+    <image id="n19_fqor" name="n19" src="fqortay" fileName="imagesNew/sc_zhuangshihua1.png" xy="0,0"/>
+    <image id="n15_fqor" name="n15" src="fqortaz" fileName="imagesNew/sc_lianzi.png" xy="42,492"/>
+    <component id="n8_fqor" name="comTab" src="fqortb5" fileName="components/ComTab.xml" xy="111,270"/>
+    <image id="n13_fqor" name="n13" src="fqortb8" fileName="imagesNew/sc_yeqian_zhedang.png" xy="924,255"/>
+    <image id="n6_fqor" name="n6" src="fqortb0" fileName="imagesNew/sc_kuangjia.png" xy="0,175">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <list id="n7_fqor" name="listSubTab" xy="119,412" size="858,67" layout="row" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://p9mtgheofqortb4" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/RechargeStore/components/Button1.xml → FGUIProject/assets/Store/components/Button1.xml

@@ -2,7 +2,7 @@
 <component size="298,152" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n0_nz0t" name="n0" src="d4iwc" fileName="images/sc_yj_anniu_xz.png" xy="0,0">
+    <image id="n0_nz0t" name="n0" src="d4iwc" fileName="images/sc_yj_anniu_xz.png" xy="0,0" pkg="vlgobc15">
       <gearDisplay controller="button" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

FGUIProject/assets/RechargeStore/components/Button2.xml → FGUIProject/assets/Store/components/Button2.xml

@@ -2,8 +2,8 @@
 <component size="258,70" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n4_iftf" name="loaMascot" xy="3,-231" size="252,232" url="ui://vlgobc15iftftac"/>
-    <loader id="n2_10not" name="icon" xy="0,0" size="258,70" url="ui://vlgobc15dmsi17" autoSize="true"/>
+    <loader id="n4_iftf" name="loaMascot" xy="3,-231" size="252,232" url="ui://p9mtgheoiftftac"/>
+    <loader id="n2_10not" name="icon" xy="0,0" size="258,70" url="ui://p9mtgheodmsi17" autoSize="true"/>
   </displayList>
   <Button mode="Radio"/>
   <customProperty target="loaMascot" propertyId="1"/>

FGUIProject/assets/Store/components/Button3.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="128,128" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n0_fqor" name="n0" src="fqortax" fileName="imagesNew/sc_tab.png" xy="0,0">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <image id="n2_fqor" name="n2" src="fqortaq" fileName="imagesNew/sc_tab_xuanzhong.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <loader id="n1_fqor" name="icon" xy="11,11" pivot="0.5,0.5" size="106,106" url="ui://p9mtgheofqortan" autoSize="true"/>
+    <text id="n3_fqor" name="txt0" xy="-9,56" pivot="0.5,0" size="48,59" font="ui://eg2y0ldpa0cftks" fontSize="44" color="#be8c52" align="center" text="充">
+      <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
+    </text>
+    <text id="n4_fqor" name="txt1" xy="31,89" pivot="0.5,0" size="36,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#be8c52" align="center" text="值">
+      <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+  <customProperty target="txt0" propertyId="0"/>
+  <customProperty target="txt1" propertyId="0"/>
+</component>

FGUIProject/assets/Store/components/Button4.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="210,68" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n0_fqor" name="n0" src="fqortaw" fileName="imagesNew/sc_subtab.png" xy="0,0">
+      <gearDisplay controller="button" pages="0,2"/>
+    </image>
+    <image id="n1_fqor" name="n1" src="fqortav" fileName="imagesNew/sc_subTab_xz.png" xy="0,0">
+      <gearDisplay controller="button" pages="1,3"/>
+    </image>
+    <text id="n2_fqor" name="title" xy="0,0" size="210,68" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" vAlign="middle" autoSize="none" singleLine="true" text="充值">
+      <gearColor controller="button" pages="0,1" values="#716660,#000000|#5a3e16,#000000"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Store/components/ComTab.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="857,129" overflow="scroll" scroll="horizontal">
+  <controller name="c1" pages="0,,1,,2,,3,,4,,5," selected="0"/>
+  <displayList>
+    <component id="n9_fqor" name="n9" src="fqortb1" fileName="components/Button3.xml" xy="0,0" group="n14_fqor">
+      <Button checked="true" icon="ui://p9mtgheofqortao" selectedIcon="ui://p9mtgheofqortan" controller="c1" page="1"/>
+    </component>
+    <component id="n10_fqor" name="n10" src="fqortb1" fileName="components/Button3.xml" xy="193,0" group="n14_fqor">
+      <Button icon="ui://p9mtgheofqortak" selectedIcon="ui://p9mtgheofqortaj" controller="c1" page="2"/>
+      <property target="txt0" propertyId="0" value="月"/>
+      <property target="txt1" propertyId="0" value="卡"/>
+    </component>
+    <component id="n11_fqor" name="n11" src="fqortb1" fileName="components/Button3.xml" xy="386,0" group="n14_fqor">
+      <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="3"/>
+      <property target="txt0" propertyId="0" value="礼"/>
+      <property target="txt1" propertyId="0" value="包"/>
+    </component>
+    <component id="n12_fqor" name="n12" src="fqortb1" fileName="components/Button3.xml" xy="579,0" group="n14_fqor">
+      <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="4"/>
+      <property target="txt0" propertyId="0" value="兑"/>
+      <property target="txt1" propertyId="0" value="换"/>
+    </component>
+    <component id="n13_fqor" name="n13" src="fqortb1" fileName="components/Button3.xml" xy="772,0" group="n14_fqor">
+      <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="5"/>
+      <property target="txt0" propertyId="0" value="竞"/>
+      <property target="txt1" propertyId="0" value="技"/>
+    </component>
+    <group id="n14_fqor" name="n14" xy="0,0" size="900,128" advanced="true" layout="hz" colGap="65" excludeInvisibles="true"/>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/ComZhuangShi.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="390,500" opaque="false">
+  <displayList>
+    <image id="n18_fqor" name="n18" src="fqortap" fileName="imagesNew/sc_zhuangshihua.png" xy="0,0" group="n20_fqor"/>
+    <image id="n16_fqor" name="n16" src="fqortai" fileName="imagesNew/sc_zhuangshishan.png" xy="222,424" group="n20_fqor"/>
+    <group id="n20_fqor" name="n20" xy="0,0" size="390,478" advanced="true"/>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/Component1.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="890,70">
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <displayList>
+    <component id="n17_10not" name="btn0" src="dmsi1q" fileName="components/Button2.xml" xy="0,0">
+      <Button checked="true" icon="ui://p9mtgheodmsi17" selectedIcon="ui://p9mtgheodmsi16" controller="c1" page="0"/>
+      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftaa"/>
+    </component>
+    <component id="n18_10not" name="btn1" src="dmsi1q" fileName="components/Button2.xml" xy="314,0">
+      <Button icon="ui://p9mtgheodmsi19" selectedIcon="ui://p9mtgheodmsi18" controller="c1" page="1"/>
+      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftab"/>
+    </component>
+    <component id="n19_10not" name="btn2" src="dmsi1q" fileName="components/Button2.xml" xy="628,0">
+      <Button icon="ui://p9mtgheodmsi1b" selectedIcon="ui://p9mtgheodmsi1a" controller="c1" page="2"/>
+      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftac"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/Component2.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="264,79" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1," selected="0">
+    <remark page="0" value="货币"/>
+    <remark page="1" value="现金"/>
+  </controller>
+  <displayList>
+    <loader id="n15_iftf" name="loaIcon" xy="85,15" size="49,49" group="n17_iftf" aspect="true" url="ui://eg2y0ldpq08x4" fill="scale">
+      <gearDisplay controller="c1" pages="0"/>
+    </loader>
+    <text id="n22_hhx9" name="n22" xy="145,12" size="44,54" group="n17_iftf" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#5a3e16" text="￥">
+      <gearDisplay controller="c1" pages="1"/>
+    </text>
+    <group id="n17_iftf" name="n17" xy="85,15" size="49,49" group="n19_iftf" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <text id="n18_iftf" name="txtTitle" xy="134,12" size="43,54" group="n19_iftf" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#5a3e16" align="center" vAlign="middle" vars="true" singleLine="true" text="60">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <group id="n19_iftf" name="n19" xy="85,12" size="92,54" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/ListChargeItem.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="302,517">
+  <displayList>
+    <image id="n17_dmsi" name="n17" src="hhx9b" fileName="imagesNew/wp_baseboard.png" xy="0,0" size="304,492"/>
+    <loader id="n15_d4iw" name="icon" xy="52,166" size="197,197" aspect="true" url="ui://p9mtgheohhx91j" fill="scaleMatchHeight"/>
+    <image id="n12_d4iw" name="imgDouble" src="hhx9a" fileName="imagesNew/wp_save_baseboard.png" xy="-1,338"/>
+    <image id="n24_hhx9" name="n24" src="fqortau" fileName="imagesNew/sc_xian.png" xy="33,104" size="236,4"/>
+    <text id="n16_d4iw" name="txtName" xy="80,52" pivot="0.5,0" size="142,54" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#5a3e16" align="center" text="钻石600">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <component id="n14_d4iw" name="btnBuy" src="iftftaf" fileName="components/Component2.xml" xy="18,412" size="265,80">
+      <relation target="" sidePair="center-center"/>
+    </component>
+    <text id="n18_dmsi" name="txtDesc" xy="48,380" pivot="0.5,0" size="204,36" font="ui://eg2y0ldpa0cftks" fontSize="26" color="#ac4100" letterSpacing="-2" text="首充赠送+6000钻石"/>
+    <text id="n23_hhx9" name="n23" xy="9,337" size="122,42" fontSize="30" color="#ffffff" text="首充双倍"/>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/ProgressBar1.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="664,24" extention="ProgressBar">
+  <displayList>
+    <image id="n3_hhx9" name="n3" src="hhx9g" fileName="imagesNew/VipLevel_Progress_baseboard.png" xy="5,3" size="654,18"/>
+    <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="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>
+  <ProgressBar titleType="valueAndmax"/>
+</component>

FGUIProject/assets/RechargeStore/components/StoreListItem.xml → FGUIProject/assets/Store/components/StoreListItem.xml

@@ -10,7 +10,7 @@
     </image>
     <image id="n12_d4iw" name="imgDouble" src="dmsi1e" fileName="images/sc_kuangjia_2.png" xy="234,109"/>
     <loader id="n15_d4iw" name="icon" xy="70,211" size="162,162" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
-    <text id="n16_d4iw" name="txtName" xy="79,140" pivot="0.5,0" size="142,51" fontSize="38" color="#906d4b" align="center" text="钻石600">
+    <text id="n16_d4iw" name="txtName" xy="83,140" pivot="0.5,0" size="134,51" fontSize="38" color="#906d4b" align="center" text="钻石600">
       <gearColor controller="c1" pages="1" values="#837d6f,#000000" default="#906d4b,#000000"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
@@ -18,7 +18,7 @@
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <text id="n18_dmsi" name="txtDesc" xy="0,380" pivot="0.5,0" size="301,49" fontSize="36" color="#bb674e" letterSpacing="-2" text="首充赠送+6000钻石"/>
-    <text id="n21_ysx9" name="txtExchangeCount" xy="209,334" pivot="1,0" size="62,49" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#967e64" strokeSize="2" text="x{count=20}"/>
+    <text id="n18_dmsi" name="txtDesc" xy="3,380" pivot="0.5,0" size="294,49" fontSize="36" color="#bb674e" letterSpacing="-2" text="首充赠送+6000钻石"/>
+    <text id="n21_ysx9" name="txtExchangeCount" xy="215,334" pivot="1,0" size="56,49" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#967e64" strokeSize="2" text="x{count=20}"/>
   </displayList>
 </component>

FGUIProject/assets/Store/font/Font1.fnt

@@ -0,0 +1,10 @@
+char id=48 img=hhx99 xoffset=0 yoffset=0 xadvance=0
+char id=49 img=hhx98 xoffset=0 yoffset=0 xadvance=0
+char id=50 img=hhx97 xoffset=0 yoffset=0 xadvance=0
+char id=51 img=hhx96 xoffset=0 yoffset=0 xadvance=0
+char id=52 img=hhx95 xoffset=0 yoffset=0 xadvance=0
+char id=53 img=hhx94 xoffset=0 yoffset=0 xadvance=0
+char id=54 img=hhx93 xoffset=0 yoffset=0 xadvance=0
+char id=55 img=hhx92 xoffset=0 yoffset=0 xadvance=0
+char id=56 img=hhx9h xoffset=0 yoffset=0 xadvance=0
+char id=57 img=hhx9i xoffset=0 yoffset=0 xadvance=0

FGUIProject/assets/Store/font/Font2.fnt

@@ -0,0 +1,10 @@
+char id=48 img=hhx9x xoffset=0 yoffset=0 xadvance=0
+char id=49 img=hhx9y xoffset=0 yoffset=0 xadvance=0
+char id=50 img=hhx9z xoffset=0 yoffset=0 xadvance=0
+char id=51 img=hhx910 xoffset=0 yoffset=0 xadvance=0
+char id=52 img=hhx911 xoffset=0 yoffset=0 xadvance=0
+char id=53 img=hhx912 xoffset=0 yoffset=0 xadvance=0
+char id=54 img=hhx913 xoffset=0 yoffset=0 xadvance=0
+char id=55 img=hhx914 xoffset=0 yoffset=0 xadvance=0
+char id=56 img=hhx915 xoffset=0 yoffset=0 xadvance=0
+char id=57 img=hhx916 xoffset=0 yoffset=0 xadvance=0