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

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

@@ -97,7 +97,7 @@ namespace GFGGame
             var item = UI_BrocadeWeavRewardItem.Proxy(obj);
             var level = index;
             var battlePassCfg = _rewardCfgs[level];
-            item.m_Level.text = (index + 1).ToString();
+            item.m_Level.text = (index + 1).ToString()+ "天";
             //设置奖励
             var bonusNormalArr = battlePassCfg.bonusFreeArr;
             if (bonusNormalArr != null && bonusNormalArr.Length > 0)
@@ -108,6 +108,14 @@ namespace GFGGame
                 comItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemNormal);
                 comItem.m_txtCount.text = bonusNormalArr[0][1].ToString();
                 comItem.m_QualityType.selectedIndex = itemNormal.rarity - 1;
+                if (ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0][index] == 0)
+                {
+                    comItem.m_Lock.selectedIndex = 2;
+                }
+                else
+                {
+                    comItem.m_Lock.selectedIndex = 0;
+                }
                 if (index <= ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0].Count)
                 {
                     if (ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0][index] == 2)
@@ -158,6 +166,14 @@ namespace GFGGame
             comItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemNormal);
             comItem.m_txtCount.text = itemInfo[index][1].ToString();
             comItem.m_QualityType.selectedIndex = itemNormal.rarity - 1;
+            if (ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1][day] == 0)
+            {
+                comItem.m_Lock.selectedIndex = 1;
+            }
+            else
+            {
+                comItem.m_Lock.selectedIndex = 0;
+            }
             if (day <= ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1].Count)
             {
                 if (ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1][day] == 2)