|  | @@ -318,11 +318,11 @@ namespace GFGGame
 | 
	
		
			
				|  |  |              {
 | 
	
		
			
				|  |  |                  ShopCfg shopcfg = ShopCfgArray.Instance.GetCfg(giftBagList[i]);
 | 
	
		
			
				|  |  |                  var item = EverydaySaleCfgArray.Instance.dataArray[i];
 | 
	
		
			
				|  |  | -                if (item.openTime == "" || item.openTime == null)
 | 
	
		
			
				|  |  | -                {
 | 
	
		
			
				|  |  | -                    shopCfgs.Add(shopcfg);
 | 
	
		
			
				|  |  | -                    break;
 | 
	
		
			
				|  |  | -                }
 | 
	
		
			
				|  |  | +                //if (item.openTime == "" || item.openTime == null)
 | 
	
		
			
				|  |  | +                //{
 | 
	
		
			
				|  |  | +                //    shopCfgs.Add(shopcfg);
 | 
	
		
			
				|  |  | +                //    break;
 | 
	
		
			
				|  |  | +                //}
 | 
	
		
			
				|  |  |                  if (IsDisountTime(item) || day_CreateRole >= item.id*2)
 | 
	
		
			
				|  |  |                  {
 | 
	
		
			
				|  |  |                      shopCfgs.Add(shopcfg);
 | 
	
	
		
			
				|  | @@ -332,7 +332,7 @@ namespace GFGGame
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          private bool IsDisountTime(EverydaySaleCfg item)
 | 
	
		
			
				|  |  |          {
 | 
	
		
			
				|  |  | -            if(item.activityId == 6002 && item.openTime == "")
 | 
	
		
			
				|  |  | +            if(item.activityId == 6002)
 | 
	
		
			
				|  |  |              {
 | 
	
		
			
				|  |  |                  return ActivityGlobalDataManager.Instance.IsActivityOpen(item.activityId);
 | 
	
		
			
				|  |  |              }
 | 
	
	
		
			
				|  | @@ -361,12 +361,12 @@ namespace GFGGame
 | 
	
		
			
				|  |  |              int count = 0;
 | 
	
		
			
				|  |  |              foreach (var item in EverydaySaleCfgArray.Instance.dataArray)
 | 
	
		
			
				|  |  |              {
 | 
	
		
			
				|  |  | -                if(item.activityId == 6002)
 | 
	
		
			
				|  |  | -                {
 | 
	
		
			
				|  |  | -                    listIndex.Add(giftBagList[count]);
 | 
	
		
			
				|  |  | -                    count++;
 | 
	
		
			
				|  |  | -                    break;
 | 
	
		
			
				|  |  | -                }
 | 
	
		
			
				|  |  | +                //if (item.activityId == 6002)
 | 
	
		
			
				|  |  | +                //{
 | 
	
		
			
				|  |  | +                //    listIndex.Add(giftBagList[count]);
 | 
	
		
			
				|  |  | +                //    count++;
 | 
	
		
			
				|  |  | +                //    break;
 | 
	
		
			
				|  |  | +                //}
 | 
	
		
			
				|  |  |                  if (IsDisountTime(item))
 | 
	
		
			
				|  |  |                  {
 | 
	
		
			
				|  |  |                      listIndex.Add(giftBagList[count]);
 |