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

GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs

@@ -197,20 +197,20 @@ namespace GFGGame
                 bool isGet = false;
                 switch (welfareCfg.type)
                 {
-                    case LeagueWelfareType.Day:
+                    case LeagueWelfareType.Day: //普通日福利
                         isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareDay) > 0;
                         isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareDay) == 1;
                         break;
-                    case LeagueWelfareType.Week:
+                    case LeagueWelfareType.Week: //普通周福利
                         isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareWeekLeftTimes) > 0;
                         isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareWeek) == 1;
                         break;
-                    case LeagueWelfareType.SuperWeek:
-                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperWeek) > 0;
+                    case LeagueWelfareType.SuperWeek: //超级周福利
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperLeftTimes) > 0;
                         isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareSuperWeek) == 1;
                         break;
-                    case LeagueWelfareType.SuperDay:
-                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperLeftTimes) > 0;
+                    case LeagueWelfareType.SuperDay: //超级日福利
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperDay) > 0;
                         isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareSuperDay) == 1;
                         break;
                 }
@@ -242,11 +242,11 @@ namespace GFGGame
                         buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareDay);
                         break;
                     case LeagueWelfareType.Week:
-                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareWeek);
+                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareWeekLeftTimes) > 0 ? 1 : 0;
                         endTime = GetNumeriValue(LeagueNumericType.LeagueWelfareWeekLeftTimes);
                         break;
                     case LeagueWelfareType.SuperWeek:
-                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareSuperWeek);
+                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareSuperLeftTimes) > 0 ? 1 : 0;
                         endTime = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperLeftTimes);
                         break;
                     case LeagueWelfareType.SuperDay:

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -217,7 +217,7 @@ namespace GFGGame
             item.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + cardData.itemCfg.rarity;
             // UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
 
-            int starLevelDodge = cardData.star / 5;
+            int starLevelDodge = cardData.star / 6;
             item.m_starNumType.selectedIndex = cardData.itemCfg.starDescArr.Length - 1;
             for (int i = 0; i < 4; i++)
             {

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)