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

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: