|  | @@ -34,7 +34,7 @@ namespace GFGGame
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          //添加活动数据
 | 
	
		
			
				|  |  | -        public void AddActivityInfo(ActivityInfoProto activityInfoProto)
 | 
	
		
			
				|  |  | +        public void AddActivityInfo(ActivityInfoProto activityInfoProto, bool dispatchEvent = true)
 | 
	
		
			
				|  |  |          {
 | 
	
		
			
				|  |  |              if (activityInfoProto == null) return;
 | 
	
		
			
				|  |  |              if (activityInfos.ContainsKey(activityInfoProto.ActivityId)) return;
 | 
	
	
		
			
				|  | @@ -53,11 +53,14 @@ namespace GFGGame
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              activityInfosByType[activityInfo.Type].Add(activityInfo.ActivityId);
 | 
	
		
			
				|  |  |              LogUtil.LogEditor($"AddActivityInfo {activityInfo.Type}");
 | 
	
		
			
				|  |  | -            //ACTIVITY_ADD
 | 
	
		
			
				|  |  | -            EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD, activityInfo.ActivityId);
 | 
	
		
			
				|  |  |              var remainTime = activityInfo.EndTime - TimeHelper.ServerNow();
 | 
	
		
			
				|  |  |              if (remainTime > 0)
 | 
	
		
			
				|  |  |              {
 | 
	
		
			
				|  |  | +                //ACTIVITY_ADD
 | 
	
		
			
				|  |  | +                if(dispatchEvent)
 | 
	
		
			
				|  |  | +                {
 | 
	
		
			
				|  |  | +                    EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD);
 | 
	
		
			
				|  |  | +                }
 | 
	
		
			
				|  |  |                  Timers.inst.Add(activityInfo.EndTime - TimeHelper.ServerNow(), 1, ClientRemoveActivityInfo,
 | 
	
		
			
				|  |  |                      activityInfo.ActivityId);
 | 
	
		
			
				|  |  |              }
 |