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

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -190,15 +190,16 @@ namespace GFGGame
         }
 
         //获取成长基金消息
-        public static async ETTask<bool> ReqGetGrowthFundInfo(int activityID)
+        public static async ETTask<bool> ReqGetGrowthFundInfo(int activityID = 3002)
         {
             ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
             if(RoleDataManager.lvl < activityCfg.level || ShopDataManager.Instance.GrowthFundRewardList.Count == GrowthFundCfgArray.Instance.dataArray.Length)
             {
                 return false;
             }
-            S2C_GetGrowthFundRewrd response = null;
-            response = (S2C_GetGrowthFundRewrd)await MessageHelper.SendToServer(new C2S_GetGrowthFundRewrd() { ActivityId = activityID});
+            ShopDataManager.Instance.GrowthFundRewardList.Clear();
+            S2C_GetGrowthFundRewrdStatus response = null;
+            response = (S2C_GetGrowthFundRewrdStatus)await MessageHelper.SendToServer(new C2S_GetGrowthFundRewrdStatus() { ActivityId = activityID});
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -218,7 +219,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ShopDataManager.Instance.GrowthFundRewardList = response.RewrdIds;
+                    ShopDataManager.Instance.GrowthFundRewardList.Add(id);
                     BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -167,7 +167,7 @@ namespace GFGGame
                 }
             }
             
-            int starLevelDodge = data.star / 5;
+            int starLevelDodge = data.star / 6;
             listItem.m_starNumType.selectedIndex = data.itemCfg.starDescArr.Length - 1;
             for (int i = 0; i < data.itemCfg.starDescArr.Length; i++)
             {

GameClient/Assets/Game/HotUpdate/Views/Store/StoreGrowthFundView.cs

@@ -99,6 +99,7 @@ namespace GFGGame
             {
                 int id = ActivityOpenCfgArray.Instance.GetCfg(3002).paramsArr[0];
                 ShopSProxy.ReqShopBuy(id).Coroutine();
+                ShopSProxy.ReqGetGrowthFundInfo().Coroutine();
             }
         }
         private async void OnBtnGetClick(EventContext context)
@@ -112,10 +113,7 @@ namespace GFGGame
             }
             UI_GrowthFundItemUI.ProxyEnd();
             bool result = await ShopSProxy.ReqGetGrowthFundReward(3002,goodsId);
-            if (result)
-            {
-                _ui.m_list.numItems = GrowthFundCfgArray.Instance.dataArray.Length;
-            }
+            _ui.m_list.numItems = GrowthFundCfgArray.Instance.dataArray.Length;
         }
 
         private void ListItemRenderer(int index, GObject obj)