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

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -236,6 +236,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
         return count;
     }
 
+    // public bool IsRefenceEvent(int eventID)
+    // {
+    //     EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventID);
+    // }
+
+
     public bool IsEventTrigger(int eventID)
     {
         foreach (var eventList in AccountFileInfo.Instance.playerData.completeEvents)
@@ -339,12 +345,19 @@ public class EventSystemManager : Singleton<EventSystemManager>
             int quality = UtilTools.GetRandomByWeight(qualitys, divineSenseConfig.QualityBonusChance);
 
 
+            // // 获取通用事件
+            // List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
+            //
+            //
+            // //场景特定事件
+            // List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
+
             // 获取通用事件
-            List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
+            List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
 
 
             //场景特定事件
-            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
+            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
 
             if (candidateEvents.Count == 0 && globalEvents.Count == 0)
             {

Assets/Scripts/GameUI/UI/XianTuLogPanel/EventLogMessageWidget.cs

@@ -37,5 +37,11 @@ namespace Fort23.Mono
 			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Name.GetComponent<RectTransform>());
 			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Name.transform.parent.GetComponent<RectTransform>());
 		}
+
+		public override void DormancyObj()
+		{
+			data = null;
+			base.DormancyObj();
+		}
 	}
 }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -60,7 +60,13 @@ namespace Fort23.Mono
             UpdateTitleWidget();
         }
 
-        public async void CustomInit(int type, int id)
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            await CustomInit((int)uiData[0], (int)uiData[1]);
+            return await base.AsyncInit(uiData);
+        }
+
+        public async CTask CustomInit(int type, int id)
         {
             this.type = type;
             eventLogTitleWidget = await UIManager.Instance.CreateGComponentForObject<EventLogTitleWidget>(EventLogTitleWidget, null);
@@ -165,7 +171,7 @@ namespace Fort23.Mono
                 eventLogTitleWidget.own.SetActive(false);
             }
 
-            Content.Init(this, showXianTuLogInfoData.Count);
+            await Content.Init(this, showXianTuLogInfoData.Count);
         }
 
         public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
@@ -235,7 +241,7 @@ namespace Fort23.Mono
         private float maxY;
         private float minY;
 
-       
+
         public void UpdateTitleWidget()
         {
             if (type != 1)
@@ -298,8 +304,8 @@ namespace Fort23.Mono
 
         public async static CTask OpenPanel(int type, int id)
         {
-            XianTuLogInfoPanel xianTuLogInfoPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogInfoPanel>(null);
-            xianTuLogInfoPanel.CustomInit(type, id);
+            XianTuLogInfoPanel xianTuLogInfoPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogInfoPanel>(null, uiData: new object[] { type, id });
+            // xianTuLogInfoPanel.CustomInit(type, id);
         }
     }
 }