商城

FGUIProject/assets/Store/RechargeStoreUI.xml

@@ -48,5 +48,8 @@
     <image id="n16_10not" name="n16" src="10not1r" fileName="images/sc_kuangjia_3.png" xy="0,1613">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </image>
+    <component id="n29_hhx9" name="n29" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Store/StoreUI.xml

@@ -24,6 +24,5 @@
       <item/>
       <item/>
     </list>
-    <component id="n18_fqor" name="n18" src="hhx90" fileName="ComZhuangShi.xml" xy="690,1420"/>
   </displayList>
 </component>

FGUIProject/assets/Store/package.xml

@@ -67,7 +67,7 @@
     <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="/"/>
+    <component id="hhx90" name="ComZhuangShi.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -70,6 +70,10 @@ namespace GFGGame
         /// </summary>
         public const string LEAGUE_ANSWER = "LEAGUE_ANSWER";
         /// <summary>
+        ///商城
+        /// </summary>
+        public const string STORE = "STORE";
+        /// <summary>
         ///商城-充值
         /// </summary>
         public const string STORE_CHARGE = "STORE_CHARGE";

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

@@ -168,12 +168,12 @@ namespace GFGGame
                 case ConstFunctionId.SHOP_GIFT_BAG:
                     // this.Hide();
                     int giftBagValue = int.Parse(infos[1]);
-                    isJump = ViewManager.Show<RechargeStoreView>(giftBagValue, _fromeViewDatas);
+                    isJump = ViewManager.Show<StoreView>(new object[] { ConstFunctionId.STORE_CHARGE, giftBagValue }, _fromeViewDatas);
                     break;
                 case ConstFunctionId.SHOP_EXCHANGE:
                     // this.Hide();
                     int exchangeValue = int.Parse(infos[1]);
-                    isJump = ViewManager.Show<RechargeStoreView>(exchangeValue, _fromeViewDatas);
+                    isJump = ViewManager.Show<StoreView>(new object[] { ConstFunctionId.STORE_CHARGE, exchangeValue }, _fromeViewDatas);
                     break;
                 case ConstFunctionId.JU_QING_GUAN_QIA:
 

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -638,7 +638,7 @@ namespace GFGGame
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
             _btnLeague.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LeagueView).Name, false);
-            _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(RechargeStoreView).Name, false);
+            _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoreView).Name, false);
             _btnTuJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
 
         }

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

@@ -105,13 +105,13 @@ namespace GFGGame
 
         private void OnTabChange()
         {
-            StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(_curTabIndex);
+            StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(_ui.m_comTab.m_c1.selectedIndex);
+            if (tabCfg == null) return;
             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;
@@ -156,7 +156,7 @@ namespace GFGGame
                 return;
             }
             ViewManager.Hide(_curViewName);
-            if (!string.IsNullOrEmpty(viewName))
+            if (!string.IsNullOrEmpty(viewName) && viewName != "“”")
             {
                 ViewManager.Show("GFGGame." + viewName, index);
             }