zhaoyang 2 жил өмнө
parent
commit
0170a3c257
100 өөрчлөгдсөн 271 нэмэгдсэн , 197 устгасан
  1. 0 22
      FGUIProject/assets/RechargeStore/ComTab.xml
  2. 0 14
      FGUIProject/assets/RechargeStore/components/Button3.xml
  3. 0 18
      FGUIProject/assets/RechargeStore/components/Component1.xml
  4. 8 0
      FGUIProject/assets/Store/ComZhuangShi.xml
  5. 0 0
      FGUIProject/assets/Store/GiftBagBuyUI.xml
  6. 1 1
      FGUIProject/assets/Store/ItemExchangeUI.xml
  7. 6 11
      FGUIProject/assets/Store/RechargeStoreUI.xml
  8. 4 8
      FGUIProject/assets/Store/StoreUI.xml
  9. 1 1
      FGUIProject/assets/Store/components/Button1.xml
  10. 2 2
      FGUIProject/assets/Store/components/Button2.xml
  11. 22 0
      FGUIProject/assets/Store/components/Button3.xml
  12. 0 0
      FGUIProject/assets/Store/components/Button4.xml
  13. 30 0
      FGUIProject/assets/Store/components/ComTab.xml
  14. 18 0
      FGUIProject/assets/Store/components/Component1.xml
  15. 0 0
      FGUIProject/assets/Store/components/Component2.xml
  16. 0 0
      FGUIProject/assets/Store/components/ListGiftItem.xml
  17. 0 0
      FGUIProject/assets/Store/components/StoreListItem.xml
  18. 0 0
      FGUIProject/assets/Store/images/sc_anniuyij_1.png
  19. 0 0
      FGUIProject/assets/Store/images/sc_anniuyij_2.png
  20. 0 0
      FGUIProject/assets/Store/images/sc_anniuyij_3.png
  21. 0 0
      FGUIProject/assets/Store/images/sc_anniuyij_4.png
  22. 0 0
      FGUIProject/assets/Store/images/sc_anniuyij_5.png
  23. 0 0
      FGUIProject/assets/Store/images/sc_anniuyij_6.png
  24. 0 0
      FGUIProject/assets/Store/images/sc_cwcw_1.png
  25. 0 0
      FGUIProject/assets/Store/images/sc_cwcw_2.png
  26. 0 0
      FGUIProject/assets/Store/images/sc_cwcw_3.png
  27. 0 0
      FGUIProject/assets/Store/images/sc_kuangand.png
  28. 0 0
      FGUIProject/assets/Store/images/sc_kuangczcz.png
  29. 0 0
      FGUIProject/assets/Store/images/sc_kuangdikjia_1.png
  30. 0 0
      FGUIProject/assets/Store/images/sc_kuangdikjia_2.png
  31. 0 0
      FGUIProject/assets/Store/images/sc_kuangdikjia_3.png
  32. 0 0
      FGUIProject/assets/Store/images/sc_kuangjia_1.png
  33. 0 0
      FGUIProject/assets/Store/images/sc_kuangjia_2.png
  34. 0 0
      FGUIProject/assets/Store/images/sc_kuangjia_3.png
  35. 0 0
      FGUIProject/assets/Store/images/sc_kuangjiazi_1.png
  36. 0 0
      FGUIProject/assets/Store/images/sc_kuangsjsj.png
  37. 0 0
      FGUIProject/assets/Store/images/sc_shulianga.png
  38. 0 0
      FGUIProject/assets/Store/images/sc_tc_anniu_1.png
  39. 0 0
      FGUIProject/assets/Store/images/sc_tc_kuang_2.png
  40. 0 0
      FGUIProject/assets/Store/images/sc_tc_kuang_3.png
  41. 0 0
      FGUIProject/assets/Store/images/sc_tc_xian_1.png
  42. 0 0
      FGUIProject/assets/Store/images/sc_xtxtxt(1).png
  43. 0 0
      FGUIProject/assets/Store/images/sc_xtxtxt.png
  44. 0 0
      FGUIProject/assets/Store/images/sc_yj_xiantiao.png
  45. 0 0
      FGUIProject/assets/Store/images/scsc_anniuej_1.png
  46. 0 0
      FGUIProject/assets/Store/images/scsc_anniuej_2.png
  47. 0 0
      FGUIProject/assets/Store/images/scsc_fuhao.png
  48. 0 0
      FGUIProject/assets/Store/imagesNew/sc_beijing_hua.png
  49. 0 0
      FGUIProject/assets/Store/imagesNew/sc_beijing_shang.png
  50. 0 0
      FGUIProject/assets/Store/imagesNew/sc_jinxiexian.png
  51. 0 0
      FGUIProject/assets/Store/imagesNew/sc_kuangjia.png
  52. 0 0
      FGUIProject/assets/Store/imagesNew/sc_lianzi.png
  53. 0 0
      FGUIProject/assets/Store/imagesNew/sc_line1.png
  54. 0 0
      FGUIProject/assets/Store/imagesNew/sc_line2.png
  55. 0 0
      FGUIProject/assets/Store/imagesNew/sc_subTab_xz.png
  56. 0 0
      FGUIProject/assets/Store/imagesNew/sc_subtab.png
  57. 0 0
      FGUIProject/assets/Store/imagesNew/sc_tab.png
  58. 0 0
      FGUIProject/assets/Store/imagesNew/sc_tab_chognzhi.png
  59. 0 0
      FGUIProject/assets/Store/imagesNew/sc_tab_chognzhi_xuanzhong.png
  60. 0 0
      FGUIProject/assets/Store/imagesNew/sc_tab_libao.png
  61. 0 0
      FGUIProject/assets/Store/imagesNew/sc_tab_libao_xuanzhong.png
  62. 0 0
      FGUIProject/assets/Store/imagesNew/sc_tab_xuanzhong.png
  63. 0 0
      FGUIProject/assets/Store/imagesNew/sc_tab_yueka.png
  64. 0 0
      FGUIProject/assets/Store/imagesNew/sc_tab_yueka_xuanzhong.png
  65. 0 0
      FGUIProject/assets/Store/imagesNew/sc_xian.png
  66. 0 0
      FGUIProject/assets/Store/imagesNew/sc_xiangqing.png
  67. 0 0
      FGUIProject/assets/Store/imagesNew/sc_yeqian_zhedang.png
  68. 0 0
      FGUIProject/assets/Store/imagesNew/sc_zhuangshihua.png
  69. 0 0
      FGUIProject/assets/Store/imagesNew/sc_zhuangshihua1.png
  70. 0 0
      FGUIProject/assets/Store/imagesNew/sc_zhuangshishan.png
  71. 16 15
      FGUIProject/assets/Store/package.xml
  72. 2 2
      FGUIProject/settings/Publish.json
  73. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store.meta
  74. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button2.cs
  75. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button2.cs.meta
  76. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button3.cs
  77. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button3.cs.meta
  78. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComTab.cs
  79. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComTab.cs.meta
  80. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component1.cs
  81. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component1.cs.meta
  82. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component2.cs
  83. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component2.cs.meta
  84. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagBuyUI.cs
  85. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagBuyUI.cs.meta
  86. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ItemExchangeUI.cs
  87. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ItemExchangeUI.cs.meta
  88. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs
  89. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs.meta
  90. 3 12
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_RechargeStoreUI.cs
  91. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_RechargeStoreUI.cs.meta
  92. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreListItem.cs
  93. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreListItem.cs.meta
  94. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreUI.cs
  95. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreUI.cs.meta
  96. 7 0
      GameClient/Assets/Game/HotUpdate/Views/BaseWindow.cs
  97. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  98. 1 1
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/GiftBagBuyView.cs
  99. 2 19
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs
  100. 17 33
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/StoreView.cs

+ 0 - 22
FGUIProject/assets/RechargeStore/ComTab.xml

@@ -1,22 +0,0 @@
-<?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://vlgobc15fqortao" selectedIcon="ui://vlgobc15fqortan" 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://vlgobc15fqortam" selectedIcon="ui://vlgobc15fqortal" controller="c1" page="2"/>
-    </component>
-    <component id="n11_fqor" name="n11" src="fqortb1" fileName="components/Button3.xml" xy="386,0" group="n14_fqor">
-      <Button icon="ui://vlgobc15fqortak" selectedIcon="ui://vlgobc15fqortaj" controller="c1" page="3"/>
-    </component>
-    <component id="n12_fqor" name="n12" src="fqortb1" fileName="components/Button3.xml" xy="579,0" group="n14_fqor">
-      <Button icon="ui://vlgobc15fqortam" selectedIcon="ui://vlgobc15fqortal" controller="c1" page="4"/>
-    </component>
-    <component id="n13_fqor" name="n13" src="fqortb1" fileName="components/Button3.xml" xy="772,0" group="n14_fqor">
-      <Button icon="ui://vlgobc15fqortam" selectedIcon="ui://vlgobc15fqortal" controller="c1" page="5"/>
-    </component>
-    <group id="n14_fqor" name="n14" xy="0,0" size="900,128" advanced="true" layout="hz" colGap="65" excludeInvisibles="true"/>
-  </displayList>
-</component>

+ 0 - 14
FGUIProject/assets/RechargeStore/components/Button3.xml

@@ -1,14 +0,0 @@
-<?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://vlgobc15fqortan" autoSize="true"/>
-  </displayList>
-  <Button mode="Radio"/>
-</component>

+ 0 - 18
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>

+ 8 - 0
FGUIProject/assets/Store/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>

+ 0 - 0
FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml → FGUIProject/assets/Store/GiftBagBuyUI.xml


+ 1 - 1
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"/>

+ 6 - 11
FGUIProject/assets/RechargeStore/RechargeStoreUI.xml → FGUIProject/assets/Store/RechargeStoreUI.xml

@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,1920" opaque="false">
   <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小时后刷新">
+    <component id="n17_10not" name="comTab" src="10not1s" fileName="components/Component1.xml" xy="95,624"/>
+    <text id="n25_t8xr" name="txtRefreshTime" xy="796,480" size="200,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">
+    <list id="n10_d4iw" name="list" xy="0,696" size="1080,1008" layout="flow_hz" overflow="scroll" scrollBarFlags="64" colGap="22" defaultItem="ui://p9mtgheod4iwr" align="center" scrollItemToViewOnClick="false">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
@@ -25,7 +20,7 @@
       <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">
+    <list id="n23_10not" name="listGift" xy="0,695" size="1080,1009" layout="flow_hz" overflow="scroll" colGap="10" defaultItem="ui://p9mtgheo10not1t" align="center">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
@@ -39,7 +34,7 @@
       <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">
+    <list id="n24_10not" name="listExchange" xy="0,693" pivot="1,0" size="1080,1011" layout="flow_hz" overflow="scroll" scrollBarFlags="64" colGap="22" defaultItem="ui://p9mtgheod4iwr" align="center" scrollItemToViewOnClick="false">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

+ 4 - 8
FGUIProject/assets/RechargeStore/StoreUI.xml → FGUIProject/assets/Store/StoreUI.xml

@@ -9,25 +9,21 @@
     <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="ComTab.xml" xy="111,270"/>
+    <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>
-    <image id="n10_fqor" name="n10" src="fqortb2" fileName="imagesNew/sc_line2.png" xy="55,327"/>
-    <list id="n7_fqor" name="listSubTab" xy="119,412" size="858,67" layout="row" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://vlgobc15fqortb4" autoClearItems="true">
+    <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>
-    <image id="n18_fqor" name="n18" src="fqortap" fileName="imagesNew/sc_zhuangshihua.png" xy="690,1420" group="n20_fqor"/>
-    <image id="n16_fqor" name="n16" src="fqortai" fileName="imagesNew/sc_zhuangshishan.png" xy="912,1844" group="n20_fqor"/>
-    <group id="n20_fqor" name="n20" xy="690,1420" size="390,478" advanced="true">
-      <relation target="n6_fqor" sidePair="right-right,bottom-bottom"/>
-    </group>
+    <component id="n18_fqor" name="n18" src="hhx90" fileName="ComZhuangShi.xml" xy="690,1420"/>
   </displayList>
 </component>

+ 1 - 1
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>

+ 2 - 2
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"/>

+ 22 - 0
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>

+ 0 - 0
FGUIProject/assets/RechargeStore/components/Button4.xml → FGUIProject/assets/Store/components/Button4.xml


+ 30 - 0
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>

+ 18 - 0
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>

+ 0 - 0
FGUIProject/assets/RechargeStore/components/Component2.xml → FGUIProject/assets/Store/components/Component2.xml


+ 0 - 0
FGUIProject/assets/RechargeStore/components/ListGiftItem.xml → FGUIProject/assets/Store/components/ListGiftItem.xml


+ 0 - 0
FGUIProject/assets/RechargeStore/components/StoreListItem.xml → FGUIProject/assets/Store/components/StoreListItem.xml


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_anniuyij_1.png → FGUIProject/assets/Store/images/sc_anniuyij_1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_anniuyij_2.png → FGUIProject/assets/Store/images/sc_anniuyij_2.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_anniuyij_3.png → FGUIProject/assets/Store/images/sc_anniuyij_3.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_anniuyij_4.png → FGUIProject/assets/Store/images/sc_anniuyij_4.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_anniuyij_5.png → FGUIProject/assets/Store/images/sc_anniuyij_5.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_anniuyij_6.png → FGUIProject/assets/Store/images/sc_anniuyij_6.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_cwcw_1.png → FGUIProject/assets/Store/images/sc_cwcw_1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_cwcw_2.png → FGUIProject/assets/Store/images/sc_cwcw_2.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_cwcw_3.png → FGUIProject/assets/Store/images/sc_cwcw_3.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangand.png → FGUIProject/assets/Store/images/sc_kuangand.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangczcz.png → FGUIProject/assets/Store/images/sc_kuangczcz.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangdikjia_1.png → FGUIProject/assets/Store/images/sc_kuangdikjia_1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangdikjia_2.png → FGUIProject/assets/Store/images/sc_kuangdikjia_2.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangdikjia_3.png → FGUIProject/assets/Store/images/sc_kuangdikjia_3.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangjia_1.png → FGUIProject/assets/Store/images/sc_kuangjia_1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangjia_2.png → FGUIProject/assets/Store/images/sc_kuangjia_2.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangjia_3.png → FGUIProject/assets/Store/images/sc_kuangjia_3.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangjiazi_1.png → FGUIProject/assets/Store/images/sc_kuangjiazi_1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_kuangsjsj.png → FGUIProject/assets/Store/images/sc_kuangsjsj.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_shulianga.png → FGUIProject/assets/Store/images/sc_shulianga.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_tc_anniu_1.png → FGUIProject/assets/Store/images/sc_tc_anniu_1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_tc_kuang_2.png → FGUIProject/assets/Store/images/sc_tc_kuang_2.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_tc_kuang_3.png → FGUIProject/assets/Store/images/sc_tc_kuang_3.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_tc_xian_1.png → FGUIProject/assets/Store/images/sc_tc_xian_1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_xtxtxt(1).png → FGUIProject/assets/Store/images/sc_xtxtxt(1).png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_xtxtxt.png → FGUIProject/assets/Store/images/sc_xtxtxt.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/sc_yj_xiantiao.png → FGUIProject/assets/Store/images/sc_yj_xiantiao.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/scsc_anniuej_1.png → FGUIProject/assets/Store/images/scsc_anniuej_1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/scsc_anniuej_2.png → FGUIProject/assets/Store/images/scsc_anniuej_2.png


+ 0 - 0
FGUIProject/assets/RechargeStore/images/scsc_fuhao.png → FGUIProject/assets/Store/images/scsc_fuhao.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_beijing_hua.png → FGUIProject/assets/Store/imagesNew/sc_beijing_hua.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_beijing_shang.png → FGUIProject/assets/Store/imagesNew/sc_beijing_shang.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_jinxiexian.png → FGUIProject/assets/Store/imagesNew/sc_jinxiexian.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_kuangjia.png → FGUIProject/assets/Store/imagesNew/sc_kuangjia.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_lianzi.png → FGUIProject/assets/Store/imagesNew/sc_lianzi.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_line1.png → FGUIProject/assets/Store/imagesNew/sc_line1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_line2.png → FGUIProject/assets/Store/imagesNew/sc_line2.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_subTab_xz.png → FGUIProject/assets/Store/imagesNew/sc_subTab_xz.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_subtab.png → FGUIProject/assets/Store/imagesNew/sc_subtab.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_tab.png → FGUIProject/assets/Store/imagesNew/sc_tab.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_tab_chognzhi.png → FGUIProject/assets/Store/imagesNew/sc_tab_chognzhi.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_tab_chognzhi_xuanzhong.png → FGUIProject/assets/Store/imagesNew/sc_tab_chognzhi_xuanzhong.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_tab_libao.png → FGUIProject/assets/Store/imagesNew/sc_tab_libao.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_tab_libao_xuanzhong.png → FGUIProject/assets/Store/imagesNew/sc_tab_libao_xuanzhong.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_tab_xuanzhong.png → FGUIProject/assets/Store/imagesNew/sc_tab_xuanzhong.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_tab_yueka.png → FGUIProject/assets/Store/imagesNew/sc_tab_yueka.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_tab_yueka_xuanzhong.png → FGUIProject/assets/Store/imagesNew/sc_tab_yueka_xuanzhong.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_xian.png → FGUIProject/assets/Store/imagesNew/sc_xian.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_xiangqing.png → FGUIProject/assets/Store/imagesNew/sc_xiangqing.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_yeqian_zhedang.png → FGUIProject/assets/Store/imagesNew/sc_yeqian_zhedang.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_zhuangshihua.png → FGUIProject/assets/Store/imagesNew/sc_zhuangshihua.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_zhuangshihua1.png → FGUIProject/assets/Store/imagesNew/sc_zhuangshihua1.png


+ 0 - 0
FGUIProject/assets/RechargeStore/imagesNew/sc_zhuangshishan.png → FGUIProject/assets/Store/imagesNew/sc_zhuangshishan.png


+ 16 - 15
FGUIProject/assets/RechargeStore/package.xml → FGUIProject/assets/Store/package.xml

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<packageDescription id="vlgobc15">
+<packageDescription id="p9mtgheo">
   <resources>
-    <component id="d4iw0" name="RechargeStoreUI.xml" path="/" exported="true"/>
-    <image id="d4iwd" name="sc_yj_xiantiao.png" path="/images/" scale="9grid" scale9grid="14,0,28,0"/>
-    <image id="d4iwg" name="sc_kuangjiazi_1.png" path="/images/"/>
     <component id="d4iwr" name="StoreListItem.xml" path="/components/" exported="true"/>
     <component id="nz0t14" name="Button1.xml" path="/components/"/>
+    <component id="dmsi1q" name="Button2.xml" path="/components/"/>
+    <component id="10not1s" name="Component1.xml" path="/components/"/>
+    <component id="10not1t" name="ListGiftItem.xml" path="/components/"/>
+    <component id="iftftaf" name="Component2.xml" path="/components/"/>
+    <component id="fqortb1" name="Button3.xml" path="/components/"/>
+    <component id="fqortb4" name="Button4.xml" path="/components/"/>
+    <component id="fqortb5" name="ComTab.xml" path="/components/"/>
+    <image id="d4iwd" name="sc_yj_xiantiao.png" path="/images/" scale="9grid" scale9grid="14,0,28,0"/>
+    <image id="d4iwg" name="sc_kuangjiazi_1.png" path="/images/"/>
     <image id="dmsi15" name="scsc_anniuej_2.png" path="/images/"/>
     <image id="dmsi16" name="sc_anniuyij_1.png" path="/images/"/>
     <image id="dmsi17" name="sc_anniuyij_2.png" path="/images/"/>
@@ -25,22 +31,15 @@
     <image id="dmsi1n" name="sc_tc_anniu_1.png" path="/images/"/>
     <image id="dmsi1o" name="sc_tc_kuang_2.png" path="/images/"/>
     <image id="dmsi1p" name="sc_tc_kuang_3.png" path="/images/"/>
-    <component id="dmsi1q" name="Button2.xml" path="/components/"/>
     <image id="10not1r" name="sc_kuangjia_3.png" path="/images/"/>
-    <component id="10not1s" name="Component1.xml" path="/components/"/>
-    <component id="10not1t" name="ListGiftItem.xml" path="/components/"/>
     <image id="10not1u" name="sc_kuangand.png" path="/images/"/>
-    <component id="10nota8" name="ItemExchangeUI.xml" path="/" exported="true"/>
-    <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
     <image id="10not1x" name="sc_xtxtxt.png" path="/images/" scale="9grid" scale9grid="19,2,38,4"/>
     <image id="iftftaa" name="sc_cwcw_1.png" path="/images/"/>
     <image id="iftftab" name="sc_cwcw_2.png" path="/images/"/>
     <image id="iftftac" name="sc_cwcw_3.png" path="/images/"/>
     <image id="iftftae" name="sc_xtxtxt(1).png" path="/images/" scale="9grid" scale9grid="12,0,44,2"/>
-    <component id="iftftaf" name="Component2.xml" path="/components/"/>
     <image id="t8xrtag" name="sc_kuangdikjia_3.png" path="/images/"/>
     <image id="qqattah" name="scsc_fuhao.png" path="/images/"/>
-    <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
     <image id="fqortai" name="sc_zhuangshishan.png" path="/imagesNew/"/>
     <image id="fqortaj" name="sc_tab_yueka_xuanzhong.png" path="/imagesNew/"/>
     <image id="fqortak" name="sc_tab_yueka.png" path="/imagesNew/"/>
@@ -59,14 +58,16 @@
     <image id="fqortay" name="sc_zhuangshihua1.png" path="/imagesNew/"/>
     <image id="fqortaz" name="sc_lianzi.png" path="/imagesNew/"/>
     <image id="fqortb0" name="sc_kuangjia.png" path="/imagesNew/" scale="9grid" scale9grid="270,433,540,641"/>
-    <component id="fqortb1" name="Button3.xml" path="/components/"/>
     <image id="fqortb2" name="sc_line2.png" path="/imagesNew/"/>
     <image id="fqortb3" name="sc_line1.png" path="/imagesNew/"/>
-    <component id="fqortb4" name="Button4.xml" path="/components/"/>
-    <component id="fqortb5" name="ComTab.xml" path="/"/>
     <image id="fqortb6" name="sc_beijing_hua.png" path="/imagesNew/"/>
     <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="d4iw0" name="RechargeStoreUI.xml" path="/" exported="true"/>
+    <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
+    <component id="hhx90" name="ComZhuangShi.xml" path="/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\RechargeStore" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

+ 2 - 2
FGUIProject/settings/Publish.json

@@ -1,5 +1,5 @@
 {
-  "path": "..\\GameClient\\Assets\\ResIn\\UI",
+  "path": "../GameClient/Assets/ResIn/UI",
   "branchPath": "",
   "fileExtension": "bytes",
   "packageCount": 2,
@@ -9,7 +9,7 @@
   "compressPNG": false,
   "codeGeneration": {
     "allowGenCode": true,
-    "codePath": "..\\GameClient\\Assets\\Game\\HotUpdate\\FairyGUI\\GenCode\\",
+    "codePath": "../GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/",
     "classNamePrefix": "UI_",
     "memberNamePrefix": "m_",
     "packageName": "UI",

+ 8 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store.meta

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

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_Button2.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button2.cs

@@ -2,14 +2,14 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_Button2
     {
         public GButton target;
         public GLoader m_loaMascot;
-        public const string URL = "ui://vlgobc15dmsi1q";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheodmsi1q";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "Button2";
         private static UI_Button2 _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_Button2.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button2.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5de754d326f14f640bb617564821ac83
+guid: f0c5c9d190ee838488d6ce19979c34c4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button3.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_Button3
+    {
+        public GButton target;
+        public GTextField m_txt0;
+        public GTextField m_txt1;
+        public const string URL = "ui://p9mtgheofqortb1";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "Button3";
+        private static UI_Button3 _proxy;
+
+        public static UI_Button3 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button3();
+            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_Button3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button3();
+            }
+            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_txt0 = (GTextField)comp.GetChild("txt0");
+            m_txt1 = (GTextField)comp.GetChild("txt1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txt0 = null;
+            m_txt1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button3.cs.meta

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

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ComTab.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComTab.cs

@@ -2,14 +2,14 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_ComTab
     {
         public GComponent target;
         public Controller m_c1;
-        public const string URL = "ui://vlgobc15fqortb5";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheofqortb5";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ComTab";
         private static UI_ComTab _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ComTab.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComTab.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 28009ef095def934897534e100c12889
+guid: e957e88a4e5b61f42a270e8dbfa1b522
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_Component1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component1.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_Component1
     {
@@ -11,8 +11,8 @@ namespace UI.RechargeStore
         public UI_Button2 m_btn0;
         public UI_Button2 m_btn1;
         public UI_Button2 m_btn2;
-        public const string URL = "ui://vlgobc1510not1s";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheo10not1s";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "Component1";
         private static UI_Component1 _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_Component1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ed146acccbef83448a81bcb32f068159
+guid: b26687987c2824c49ba5ed0d61b46a78
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_Component2.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component2.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_Component2
     {
@@ -10,8 +10,8 @@ namespace UI.RechargeStore
         public Controller m_c1;
         public GLoader m_loaIcon;
         public GTextField m_txtTitle;
-        public const string URL = "ui://vlgobc15iftftaf";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheoiftftaf";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "Component2";
         private static UI_Component2 _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_Component2.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component2.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 52e355a37a6617d4eba78578a75d2bb7
+guid: f55462d1ef5d4b04f9af3380b9e2c822
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_GiftBagBuyUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagBuyUI.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_GiftBagBuyUI
     {
@@ -23,8 +23,8 @@ namespace UI.RechargeStore
         public GTextField m_txtOriginalPrice;
         public GTextField m_txtPrice;
         public GGroup m_grpOriginalPrice;
-        public const string URL = "ui://vlgobc1510not1v";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheo10not1v";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "GiftBagBuyUI";
         private static UI_GiftBagBuyUI _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_GiftBagBuyUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagBuyUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ad42820da4d01084da769a37a9a809ce
+guid: 2b93631e0f2f8ce47a5cfcde3f6418fc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ItemExchangeUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ItemExchangeUI.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_ItemExchangeUI
     {
@@ -22,8 +22,8 @@ namespace UI.RechargeStore
         public GTextField m_txtPrice;
         public GButton m_btnExchange;
         public GTextField m_txtDiscribe;
-        public const string URL = "ui://vlgobc1510nota8";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheo10nota8";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ItemExchangeUI";
         private static UI_ItemExchangeUI _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ItemExchangeUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ItemExchangeUI.cs.meta

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

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ListGiftItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_ListGiftItem
     {
@@ -24,8 +24,8 @@ namespace UI.RechargeStore
         public GGroup m_grpOriginalPrice;
         public GTextField m_txtPrice;
         public GGroup m_grpPrice;
-        public const string URL = "ui://vlgobc1510not1t";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheo10not1t";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ListGiftItem";
         private static UI_ListGiftItem _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ListGiftItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3b43a4178f1b00340b7c0fe0d6c51084
+guid: 10730a4d0c9ed794cb8cf14d1c99d4a4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 12
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_RechargeStoreUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_RechargeStoreUI.cs

@@ -2,22 +2,19 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_RechargeStoreUI
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_loaBg;
-        public GButton m_btnBack;
-        public GComponent m_valueBar;
         public UI_Component1 m_comTab;
         public GTextField m_txtRefreshTime;
         public GList m_list;
         public GList m_listGift;
         public GList m_listExchange;
-        public const string URL = "ui://vlgobc15d4iw0";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheod4iw0";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "RechargeStoreUI";
         private static UI_RechargeStoreUI _proxy;
 
@@ -64,9 +61,6 @@ namespace UI.RechargeStore
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_comTab = (UI_Component1)UI_Component1.Create(comp.GetChild("comTab"));
             m_txtRefreshTime = (GTextField)comp.GetChild("txtRefreshTime");
             m_list = (GList)comp.GetChild("list");
@@ -76,9 +70,6 @@ namespace UI.RechargeStore
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_loaBg = null;
-            m_btnBack = null;
-            m_valueBar = null;
             m_comTab.Dispose();
             m_comTab = null;
             m_txtRefreshTime = null;

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_RechargeStoreUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_RechargeStoreUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 38047fc42bc72ce4e993cd7909b5e395
+guid: a60b500458118754b9c08d5764d20886
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_StoreListItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreListItem.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_StoreListItem
     {
@@ -14,8 +14,8 @@ namespace UI.RechargeStore
         public UI_Component2 m_btnBuy;
         public GTextField m_txtDesc;
         public GTextField m_txtExchangeCount;
-        public const string URL = "ui://vlgobc15d4iwr";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheod4iwr";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreListItem";
         private static UI_StoreListItem _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_StoreListItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreListItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5b9f3736ce892c045b0701302ba90c4b
+guid: a522eacfd3768144c9abbabaaccf20f2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_StoreUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreUI.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.RechargeStore
+namespace UI.Store
 {
     public partial class UI_StoreUI
     {
@@ -12,8 +12,8 @@ namespace UI.RechargeStore
         public GButton m_btnBack;
         public UI_ComTab m_comTab;
         public GList m_listSubTab;
-        public const string URL = "ui://vlgobc15fqor7x";
-        public const string PACKAGE_NAME = "RechargeStore";
+        public const string URL = "ui://p9mtgheofqor7x";
+        public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreUI";
         private static UI_StoreUI _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_StoreUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f5461aae0802ea54fb3ba485d087c183
+guid: fc7cc2a742b5d8a4bab88196f0365fce
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 0
GameClient/Assets/Game/HotUpdate/Views/BaseWindow.cs

@@ -26,6 +26,13 @@ namespace GFGGame
             }
         }
 
+        protected bool bringToFontOnClick
+        {
+            set
+            {
+                _window.bringToFontOnClick = value;
+            }
+        }
         /// <summary>
         /// 点击空白关闭,true关闭,false不关闭,默认值关闭
         /// </summary>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -547,7 +547,7 @@ namespace GFGGame
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
 
-            ViewManager.Show<StoreView>();
+            ViewManager.Show<StoreView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
 
         private void OnClickBtnTuJian()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/GiftBagBuyView.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using ET;
 using FairyGUI;
-using UI.RechargeStore;
+using UI.Store;
 
 namespace GFGGame
 {

+ 2 - 19
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -1,4 +1,4 @@
-using UI.RechargeStore;
+using UI.Store;
 using UI.CommonGame;
 using FairyGUI;
 using System.Collections.Generic;
@@ -9,17 +9,10 @@ namespace GFGGame
     public class RechargeStoreView : BaseWindow
     {
         private UI_RechargeStoreUI _ui;
-        private ValueBarController _valueBarController;
-
         private List<GiftBagCfg> _giftCfgs;
         private List<ShopExchangeCfg> _exchangeCfgs;
         public override void Dispose()
         {
-            if (_valueBarController != null)
-            {
-                _valueBarController.Dispose();
-                _valueBarController = null;
-            }
 
             if (_ui != null)
             {
@@ -36,9 +29,7 @@ namespace GFGGame
             _ui = UI_RechargeStoreUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-
-            _valueBarController = new ValueBarController(_ui.m_valueBar);
-            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            this.clickBlankToClose = false;
 
             _ui.m_list.itemRenderer = ListItemRenderer;
             _ui.m_listGift.itemRenderer = ListGiftItemRenderer;
@@ -60,9 +51,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("scsc_bjbj");
-
-            _valueBarController.OnShown();
 
             _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
             _ui.m_comTab.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
@@ -76,7 +64,6 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            _valueBarController.OnHide();
             Timers.inst.Remove(UpdateExchangeTime);
 
         }
@@ -88,10 +75,6 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
-        private void OnClickBtnBack()
-        {
-            this.Hide();
-        }
 
         private void OnComTabChange()
         {

+ 17 - 33
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/StoreView.cs

@@ -1,4 +1,4 @@
-using UI.RechargeStore;
+using UI.Store;
 using UI.CommonGame;
 using FairyGUI;
 using System.Collections.Generic;
@@ -40,34 +40,10 @@ namespace GFGGame
             _ui = UI_StoreUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-
-            // _tabDic[0] = _subTabChargeDic;
-            // _tabDic[1] = _subTabGiftBagDic;
-            // _tabDic[2] = _subTabMonthCardDic;
-            // _tabDic[3] = _subTabExchangeDic;
-            // _tabDic[4] = _subTabArenaDic;
-
-
-            // _subTabChargeDic[0] = new List<object>() { "充值", "累计充值" };//充值
-            // _subTabGiftBagDic[0] = new List<object>() { "活动", "限时", "精选", "热销" };//礼包
-            // _subTabMonthCardDic[0] = new List<object>() { "金卡", "黑金卡" };//月卡
-            // _subTabExchangeDic[0] = new List<object>() { "画廊商城" };//兑换
-            // _subTabArenaDic[0] = new List<object>();//竞技场
-
-            // _subTabChargeDic[1] = new List<object>() { "RechargeStoreView", "" };//充值
-            // _subTabGiftBagDic[1] = new List<object>() { "GiftBagBuyView", "", "", "" };//礼包
-            // _subTabMonthCardDic[1] = new List<object>() { "", "" };//月卡
-            // _subTabExchangeDic[1] = new List<object>() { "ItemExchangeView", "" };//兑换
-            // _subTabArenaDic[1] = new List<object>();//竞技场
-
-            // _subTabChargeDic[2] = new List<object>() { null, null };//充值
-            // _subTabGiftBagDic[2] = new List<object>() { null, null, null, null };//礼包
-            // _subTabMonthCardDic[2] = new List<object>() { null, null };//月卡
-            // _subTabExchangeDic[2] = new List<object>() { null, null };//兑换
-            // _subTabArenaDic[2] = new List<object>();//竞技场
+            this.bringToFontOnClick = false;
 
             StoreTabCfg arenaTab = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_ARENA);
-            _arenaSubTab.Add(new List<string>() { arenaTab.subTabArr[0][0], arenaTab.subTabArr[0].Length > 2 ? arenaTab.subTabArr[0][1] : "" });
+            _arenaSubTab.Add(new List<string>() { arenaTab.subTabArr[0][0], arenaTab.subTabArr[0][1] });
             for (int i = ArenaDataManager.Instance.SeasonId; i > 0; i--)
             {
                 _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), "" });
@@ -80,6 +56,7 @@ namespace GFGGame
             _ui.m_comTab.m_c1.onChanged.Add(OnTabChange);
             _ui.m_listSubTab.itemRenderer = RenderListSubTabItem;
             _ui.m_listSubTab.onClickItem.Add(OnListSubTabClick);
+            // _ui.m_listSubTab.selectionController.onChanged.Add(OnListSubTabClick);
 
         }
         protected override void AddEventListener()
@@ -96,14 +73,14 @@ namespace GFGGame
             StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfgByfunctionId(functionId);
             _curTabIndex = tabCfg == null ? 1 : tabCfg.index;
             _ui.m_comTab.m_c1.selectedIndex = _curTabIndex;
-            _ui.m_comTab.target.scrollPane.SetPercX((float)_curTabIndex / (float)StoreTabCfgArray.Instance.dataArray.Length, false);
+            _ui.m_comTab.target.scrollPane.SetPercX((float)(_curTabIndex - 1) / (float)StoreTabCfgArray.Instance.dataArray.Length, false);
 
             _curSubTabIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[1];
-
             if (_ui.m_listSubTab.numItems > _curSubTabIndex)
             {
                 _ui.m_listSubTab.selectedIndex = _curSubTabIndex;
                 _ui.m_listSubTab.ScrollToView(_curSubTabIndex);
+                OnListSubTabChange(_curSubTabIndex);
             }
         }
 
@@ -122,7 +99,8 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            this.Hide();
+            ViewManager.Hide(_curViewName);
+            ViewManager.GoBackFrom(typeof(StoreView).FullName);
         }
 
         private void OnTabChange()
@@ -144,6 +122,7 @@ namespace GFGGame
             }
             _ui.m_listSubTab.selectedIndex = 0;
             _curSubTabIndex = 0;
+            OnListSubTabChange(_curSubTabIndex);
         }
         private void RenderListSubTabItem(int index, GObject obj)
         {
@@ -163,21 +142,26 @@ namespace GFGGame
         {
             GObject obj = context.data as GObject;
             int index = (int)obj.data;
+            if (index < 0) return;
+        }
+        private void OnListSubTabChange(int index)
+        {
+
             StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(_curTabIndex);
 
-            string viewName = tabCfg.subTabArr[index].Length > 2 ? tabCfg.subTabArr[index][1] : "";
+            string viewName = tabCfg.subTabArr[index][1];
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(viewName))
             {
                 _ui.m_listSubTab.selectedIndex = _curSubTabIndex;
                 return;
             }
-            ViewManager.Hide("GFGGame." + _curViewName);
+            ViewManager.Hide(_curViewName);
             if (!string.IsNullOrEmpty(viewName))
             {
                 ViewManager.Show("GFGGame." + viewName, index);
             }
             _curSubTabIndex = index;
-            _curViewName = viewName;
+            _curViewName = "GFGGame." + viewName;
 
         }
         private void UpdateRedDot()

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно