Merge remote-tracking branch 'remotes/origin/master' into douYou

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -275,7 +275,7 @@ namespace GFGGame
             LeagueSproxy.GetTeapartyInfos().Coroutine();
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
             ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
-
+            ShopSProxy.ReqGetGrowthFundInfo().Coroutine();
             //RoleInfoSProxy.ReqNewRoleGetSuitStatus().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);