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

Assets/Res/Config/EventConfig.json

@@ -256,7 +256,10 @@
     {
       "ID": 13,
       "EventLinksId": [
-        10004
+        1301,
+        1302,
+        1303,
+        1304
       ],
       "EventTriggerType": 2,
       "EventTag": null,
@@ -281,7 +284,8 @@
     {
       "ID": 14,
       "EventLinksId": [
-        10005
+        1401,
+        1402
       ],
       "EventTriggerType": 2,
       "EventTag": null,
@@ -306,7 +310,8 @@
     {
       "ID": 15,
       "EventLinksId": [
-        10006
+        1501,
+        1502
       ],
       "EventTriggerType": 2,
       "EventTag": null,

Assets/Res/Config/EventLinkConfig.json

@@ -579,10 +579,28 @@
       ],
       "ResultType": 2,
       "ResultOptions": [
-        1102,
+        1402,
         100
       ]
     },
+    {
+      "ID": 1402,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        209
+      ],
+      "EventID": 14,
+      "optionType": 3,
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        3000
+      ],
+      "ResultType": null
+    },
     {
       "ID": 1501,
       "conciseEventMessage": null,
@@ -598,10 +616,28 @@
       ],
       "ResultType": 2,
       "ResultOptions": [
-        1102,
+        1502,
         100
       ]
     },
+    {
+      "ID": 1502,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        209
+      ],
+      "EventID": 15,
+      "optionType": 3,
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        3000
+      ],
+      "ResultType": null
+    },
     {
       "ID": 9003,
       "conciseEventMessage": 2036,

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -428,7 +428,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
                         AccountFileInfo.EventConditionData eventConditionData = new AccountFileInfo.EventConditionData();
                         eventConditionData.eventId = eventList.eventID;
                         eventConditionData.eventCondition = i1;
-                        // AccountFileInfo.Instance.playerData.eventConditionDatas.Add(eventConditionData);
                         eventLinkData.eventConditions.Add(eventConditionData);
 
                         //初始化先检测一些条件

Assets/Scripts/GameUI/GameApplction.cs

@@ -162,13 +162,13 @@ public class GameApplction : IGameStart
         gameStartUIPanel.ShowMassge("loadCombat");
         gameStartUIPanel.SetSlider(0.95f);
         var eventList = EventSystemManager.Instance.AddEvent(10001);
-        EventSystemManager.Instance.UpdateZuizhongEventData();
+      
         if (eventList != null)
         {
             AccountFileInfo.Instance.playerData.eventList.Add(eventList);
             AccountFileInfo.Instance.SavePlayerData();
         }
-
+        EventSystemManager.Instance.UpdateZuizhongEventData();
         await CombatDrive.Instance.StartCombat(startCombatInfo);
         PlayerManager.Instance.GongFaControl.SaveUseSkill();
         PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(AccountFileInfo.Instance.playerData.heroData

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -13,6 +13,8 @@ namespace Fort23.Mono
 
         List<ShengShiEventWidgetType2> shengShiEventWidgetTypeList = new List<ShengShiEventWidgetType2>();
 
+        private ShengShiEventWidgetType2 mainShengShiEventWidgetType2;
+
         private int saixuanType = 1;
 
 
@@ -71,11 +73,6 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
-            ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
-            shengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
-            shengShiEventWidgetType2.OnClick = OnClick;
-
             await UpdateContent();
             return await base.AsyncInit(uiData);
         }
@@ -87,6 +84,12 @@ namespace Fort23.Mono
                 UIManager.Instance.DormancyGComponent(shengShiEventWidgetType2);
             }
 
+            if (mainShengShiEventWidgetType2 == null)
+                mainShengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
+            AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
+            mainShengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
+            mainShengShiEventWidgetType2.OnClick = OnClick;
+
             shengShiEventWidgetTypeList.Clear();
 
             int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
@@ -152,10 +155,8 @@ namespace Fort23.Mono
 
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
             {
-                // Content.Init(this, showEventList.Count);
                 this.GObjectPoolInterface.SetActive(true);
                 UpdateContent();
-                // EventSystemManager.Instance.isOpenUi = true;
             });
         }
 
@@ -184,6 +185,7 @@ namespace Fort23.Mono
             shengShiEventWidgetTypeList.Clear();
             EventSystemManager.Instance.isOpenUi = false;
             saixuanType = 1;
+            mainShengShiEventWidgetType2 = null;
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -63,6 +63,13 @@ namespace Fort23.Mono
 
         public async void CustomInit(AccountFileInfo.EventList eventList, Action<ItemWidgetBasic> goCallBack)
         {
+            foreach (var widgetItem in widgetList)
+            {
+                UIManager.Instance.DormancyGComponent(widgetItem);
+            }
+
+            widgetList.Clear();
+
             this.eventList = eventList;
             this.goCallBack = goCallBack;
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);