Merge branch 'master' of http://192.168.2.10:3000/GFG/Client into yuqian

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -147,7 +147,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
                 return;
             }
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
 
         private void UpdateTime(object param = null)