Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -351,7 +351,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
             //刷新支线任务
             List<EventConfig> zhiXianEvents = eventConfigs.Where(e =>
                 e.EventTriggerType == 6 && !BagIsEvent(e.ID) && !IsEventTrigger(e.ID) &&
-                e.SmallPlacesId == smallPlacesConfig.ID &&
+                ((e.SmallPlacesId == 0 && e.placeID == 0) ||
+                 (e.SmallPlacesId != 0 && e.SmallPlacesId == smallPlacesConfig.ID) ||
+                 (e.SmallPlacesId == 0 && e.placeID == smallPlacesConfig.PlacesId)) &&
                 eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID)).ToList();
 
             if (zhiXianEvents.Count > 0)