zhaoyang %!s(int64=2) %!d(string=hai) anos
pai
achega
88b3740c89
Modificáronse 24 ficheiros con 650 adicións e 54 borrados
  1. 3 1
      FGUIProject/assets/League/LeagueChangeNameUI.xml
  2. 18 10
      FGUIProject/assets/RechargeStore/ComTab.xml
  3. 16 6
      FGUIProject/assets/RechargeStore/StoreUI.xml
  4. 8 3
      FGUIProject/assets/RechargeStore/components/Button3.xml
  5. 20 0
      GameClient/Assets/Game/HotUpdate/Constant/ConstFunctionId.cs
  6. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ComTab.cs
  7. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ComTab.cs.meta
  8. 7 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_StoreUI.cs
  9. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  10. 111 27
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/StoreView.cs
  11. BIN=BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  12. BIN=BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0!a.png
  13. BIN=BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0.png
  14. BIN=BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_1!a.png
  15. BIN=BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_1.png
  16. BIN=BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2!a.png
  17. 96 0
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2!a.png.meta
  18. BIN=BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2.png
  19. 96 0
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2.png.meta
  20. BIN=BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3!a.png
  21. 96 0
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3!a.png.meta
  22. BIN=BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3.png
  23. 96 0
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3.png.meta
  24. BIN=BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_fui.bytes

+ 3 - 1
FGUIProject/assets/League/LeagueChangeNameUI.xml

@@ -23,7 +23,9 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </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"/>
     <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"/>
     <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">
     <group id="n7_rv09" name="n7" xy="178,412" size="705,53" advanced="true">

+ 18 - 10
FGUIProject/assets/RechargeStore/ComTab.xml

@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="857,129">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
+<component size="857,129" overflow="scroll" scroll="horizontal">
+  <controller name="c1" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <displayList>
   <displayList>
-    <image id="n8_fqor" name="n8" src="fqortb2" fileName="imagesNew/sc_line2.png" xy="-65,55"/>
-    <list id="n5_fqor" name="listTab" xy="0,0" size="857,129" layout="row" overflow="scroll" scroll="horizontal" colGap="70" defaultItem="ui://vlgobc15fqortb1" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
+    <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>
   </displayList>
 </component>
 </component>

+ 16 - 6
FGUIProject/assets/RechargeStore/StoreUI.xml

@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
 <component size="1080,1920">
   <displayList>
   <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">
+    <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"/>
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     </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"/>
+    <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="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"/>
+    <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">
     <image id="n6_fqor" name="n6" src="fqortb0" fileName="imagesNew/sc_kuangjia.png" xy="0,175">
       <relation target="" sidePair="height-height"/>
       <relation target="" sidePair="height-height"/>
     </image>
     </image>
-    <component id="n8_fqor" name="n8" src="fqortb5" fileName="ComTab.xml" xy="55,270"/>
-    <image id="n9_fqor" name="n9" src="fqortb3" fileName="imagesNew/sc_line1.png" xy="81,444"/>
+    <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://vlgobc15fqortb4" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
@@ -19,5 +24,10 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </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>
   </displayList>
   </displayList>
 </component>
 </component>

+ 8 - 3
FGUIProject/assets/RechargeStore/components/Button3.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="128,128" extention="Button">
 <component size="128,128" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
   <displayList>
-    <image id="n0_fqor" name="n0" src="fqortax" fileName="imagesNew/sc_tab.png" xy="0,0"/>
+    <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"/>
     <loader id="n1_fqor" name="icon" xy="11,11" pivot="0.5,0.5" size="106,106" url="ui://vlgobc15fqortan" autoSize="true"/>
   </displayList>
   </displayList>
-  <Button/>
+  <Button mode="Radio"/>
 </component>
 </component>

+ 20 - 0
GameClient/Assets/Game/HotUpdate/Constant/ConstFunctionId.cs

@@ -69,6 +69,26 @@ namespace GFGGame
         ///雅集-夜宴
         ///雅集-夜宴
         /// </summary>
         /// </summary>
         public const string LEAGUE_ANSWER = "LEAGUE_ANSWER";
         public const string LEAGUE_ANSWER = "LEAGUE_ANSWER";
+        /// <summary>
+        ///商城-充值
+        /// </summary>
+        public const string STORE_CHARGE = "STORE_CHARGE";
+        /// <summary>
+        ///商城-礼包
+        /// </summary>
+        public const string STORE_GIFT_BAG = "STORE_GIFT_BAG";
+        /// <summary>
+        ///商城-月卡
+        /// </summary>
+        public const string STORE_MONTH_CARD = "STORE_MONTH_CARD";
+        /// <summary>
+        ///商城-兑换
+        /// </summary>
+        public const string STORE_EXCHANGE = "STORE_EXCHANGE";
+        /// <summary>
+        ///商城-竞技场
+        /// </summary>
+        public const string STORE_ARENA = "STORE_ARENA";
 
 
     }
     }
 }
 }

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ComTab.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RechargeStore
+{
+    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 RES_NAME = "ComTab";
+        private static UI_ComTab _proxy;
+
+        public static UI_ComTab Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTab();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComTab Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTab();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_ComTab.cs.meta

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

+ 7 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_StoreUI.cs

@@ -8,9 +8,9 @@ namespace UI.RechargeStore
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public GButton m_btnBack;
         public GComponent m_valueBar;
         public GComponent m_valueBar;
-        public GList m_listTab;
+        public GButton m_btnBack;
+        public UI_ComTab m_comTab;
         public GList m_listSubTab;
         public GList m_listSubTab;
         public const string URL = "ui://vlgobc15fqor7x";
         public const string URL = "ui://vlgobc15fqor7x";
         public const string PACKAGE_NAME = "RechargeStore";
         public const string PACKAGE_NAME = "RechargeStore";
@@ -60,17 +60,18 @@ namespace UI.RechargeStore
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_listTab = (GList)comp.GetChild("listTab");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_comTab = (UI_ComTab)UI_ComTab.Create(comp.GetChild("comTab"));
             m_listSubTab = (GList)comp.GetChild("listSubTab");
             m_listSubTab = (GList)comp.GetChild("listSubTab");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaBg = null;
             m_loaBg = null;
-            m_btnBack = null;
             m_valueBar = null;
             m_valueBar = null;
-            m_listTab = null;
+            m_btnBack = null;
+            m_comTab.Dispose();
+            m_comTab = null;
             m_listSubTab = null;
             m_listSubTab = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {

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

@@ -547,7 +547,7 @@ namespace GFGGame
         {
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
 
 
-            ViewManager.Show(ViewName.RECHARGE_STORE_VIEW);
+            ViewManager.Show<StoreView>();
         }
         }
 
 
         private void OnClickBtnTuJian()
         private void OnClickBtnTuJian()

+ 111 - 27
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/StoreView.cs

@@ -6,17 +6,15 @@ using ET;
 
 
 namespace GFGGame
 namespace GFGGame
 {
 {
+
     public class StoreView : BaseWindow
     public class StoreView : BaseWindow
     {
     {
-        private Dictionary<int, Dictionary<int, List<string>>> _tabDic = new Dictionary<int, Dictionary<int, List<string>>>();
-        private Dictionary<int, List<string>> _subTabChargeDic = new Dictionary<int, List<string>>();
-        private Dictionary<int, List<string>> _subTabGiftBagDic = new Dictionary<int, List<string>>();
-        private Dictionary<int, List<string>> _subTabMonthCardDic = new Dictionary<int, List<string>>();
-        private Dictionary<int, List<string>> _subTabExchangeDic = new Dictionary<int, List<string>>();
-        private Dictionary<int, List<string>> _subTabArenaDic = new Dictionary<int, List<string>>();
-
         private UI_StoreUI _ui;
         private UI_StoreUI _ui;
         private ValueBarController _valueBarController;
         private ValueBarController _valueBarController;
+        private List<List<string>> _arenaSubTab = new List<List<string>>();
+        private int _curTabIndex = 0;
+        private int _curSubTabIndex = 0;
+        private string _curViewName = "";
 
 
         public override void Dispose()
         public override void Dispose()
         {
         {
@@ -30,6 +28,7 @@ namespace GFGGame
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();
             }
             }
+            _arenaSubTab.Clear();
             _ui = null;
             _ui = null;
             base.Dispose();
             base.Dispose();
         }
         }
@@ -42,28 +41,45 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom = _ui.target;
             isfullScreen = true;
             isfullScreen = true;
 
 
-            _tabDic[0] = _subTabChargeDic;
-            _tabDic[1] = _subTabGiftBagDic;
-            _tabDic[2] = _subTabMonthCardDic;
-            _tabDic[3] = _subTabExchangeDic;
-            _tabDic[4] = _subTabArenaDic;
-
-            _subTabChargeDic[0] = new List<string>() { "充值", "累计充值" };//充值
-            _subTabGiftBagDic[0] = new List<string>() { "活动", "限时", "精选", "热销" };//礼包
-            _subTabMonthCardDic[0] = new List<string>() { "金卡", "黑金卡" };//月卡
-            _subTabExchangeDic[0] = new List<string>() { "画廊商城" };//兑换
-            _subTabArenaDic[0] = new List<string>() { "道具" };//竞技场
+            // _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>();//竞技场
+
+            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] : "" });
+            for (int i = ArenaDataManager.Instance.SeasonId; i > 0; i--)
+            {
+                _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), "" });
+            }
 
 
-            _subTabChargeDic[1] = new List<string>() { "RechargeStoreView" };//充值
-            _subTabGiftBagDic[1] = new List<string>() { "GiftBagBuyView" };//礼包
-            _subTabMonthCardDic[1] = new List<string>() { };//月卡
-            _subTabExchangeDic[1] = new List<string>() { "ItemExchangeView" };//兑换
-            _subTabArenaDic[1] = new List<string>() { "" };//竞技场
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sc_beijing");
 
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-
-            _valueBarController = new ValueBarController(_ui.m_valueBar);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("scsc_bjbj");
+            _ui.m_comTab.m_c1.onChanged.Add(OnTabChange);
+            _ui.m_listSubTab.itemRenderer = RenderListSubTabItem;
+            _ui.m_listSubTab.onClickItem.Add(OnListSubTabClick);
 
 
         }
         }
         protected override void AddEventListener()
         protected override void AddEventListener()
@@ -73,16 +89,30 @@ namespace GFGGame
         protected override void OnShown()
         protected override void OnShown()
         {
         {
             base.OnShown();
             base.OnShown();
-
             _valueBarController.OnShown();
             _valueBarController.OnShown();
+            //this.viewData[functionId][subTabIndex]
+            string functionId = this.viewData == null ? "" : (this.viewData as object[])[0].ToString();
 
 
+            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);
 
 
+            _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);
+            }
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
             _valueBarController.OnHide();
             _valueBarController.OnHide();
+            _ui.m_comTab.m_c1.selectedIndex = 0;
+            _ui.m_listSubTab.selectedIndex = 0;
 
 
         }
         }
         protected override void RemoveEventListener()
         protected override void RemoveEventListener()
@@ -95,7 +125,61 @@ namespace GFGGame
             this.Hide();
             this.Hide();
         }
         }
 
 
+        private void OnTabChange()
+        {
+            StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(_curTabIndex);
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(tabCfg.functionId))
+            {
+                _ui.m_comTab.m_c1.selectedIndex = _ui.m_comTab.m_c1.previsousIndex;
+            }
+            _curTabIndex = _ui.m_comTab.m_c1.selectedIndex;
+            if (_curTabIndex == 0) return;
+            if (tabCfg.functionId == ConstFunctionId.STORE_ARENA)
+            {
+                _ui.m_listSubTab.numItems = _arenaSubTab.Count;
+            }
+            else
+            {
+                _ui.m_listSubTab.numItems = tabCfg.subTabArr.Length;
+            }
+            _ui.m_listSubTab.selectedIndex = 0;
+            _curSubTabIndex = 0;
+        }
+        private void RenderListSubTabItem(int index, GObject obj)
+        {
+            GButton item = obj.asButton;
+            StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(_curTabIndex);
+            if (tabCfg.functionId == ConstFunctionId.STORE_ARENA)
+            {
+                item.title = _arenaSubTab[index][0];
+            }
+            else
+            {
+                item.title = tabCfg.subTabArr[index][0];
+            }
+            item.data = index;
+        }
+        private void OnListSubTabClick(EventContext context)
+        {
+            GObject obj = context.data as GObject;
+            int index = (int)obj.data;
+            StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(_curTabIndex);
+
+            string viewName = tabCfg.subTabArr[index].Length > 2 ? tabCfg.subTabArr[index][1] : "";
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(viewName))
+            {
+                _ui.m_listSubTab.selectedIndex = _curSubTabIndex;
+                return;
+            }
+            ViewManager.Hide("GFGGame." + _curViewName);
+            if (!string.IsNullOrEmpty(viewName))
+            {
+                ViewManager.Show("GFGGame." + viewName, index);
+            }
+            _curSubTabIndex = index;
+            _curViewName = viewName;
 
 
+        }
         private void UpdateRedDot()
         private void UpdateRedDot()
         {
         {
 
 

BIN=BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0!a.png


BIN=BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0.png


BIN=BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_1!a.png


BIN=BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_1.png


BIN=BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 87b1b4891c813a648b8226f9ddcb7976
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN=BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2.png


+ 96 - 0
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: fc4ffa49d0bc5a940a70b97d2939e507
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN=BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: aa6f96ce36708984994e82ffff9ad0e9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN=BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3.png


+ 96 - 0
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 401c33d81bf592948a8bc359f09a0d66
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN=BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_fui.bytes