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

Assets/Art/cs3.scene

@@ -134477,15 +134477,15 @@ PrefabInstance:
     - target: {fileID: 5785192706951711686, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_SceneBindings.Array.data[18].key
       value: 
-      objectReference: {fileID: -187308720475102267, guid: 822da268b8f78b140a38e469ee654bf3, type: 2}
+      objectReference: {fileID: 0}
     - target: {fileID: 5785192706951711686, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_SceneBindings.Array.data[19].key
       value: 
-      objectReference: {fileID: 4352955522647890059, guid: 822da268b8f78b140a38e469ee654bf3, type: 2}
+      objectReference: {fileID: 0}
     - target: {fileID: 5785192706951711686, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_SceneBindings.Array.data[20].key
       value: 
-      objectReference: {fileID: 4663568820971706894, guid: 822da268b8f78b140a38e469ee654bf3, type: 2}
+      objectReference: {fileID: 0}
     - target: {fileID: 5785192706951711686, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_SceneBindings.Array.data[16].value
       value: 
@@ -332200,6 +332200,22 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_gf1302_sf2
       objectReference: {fileID: 0}
+    - target: {fileID: 3967213755633566040, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: randomSeed
+      value: 8703
+      objectReference: {fileID: 0}
+    - target: {fileID: 3967213755633566040, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6170846557819681638, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: randomSeed
+      value: 8703
+      objectReference: {fileID: 0}
+    - target: {fileID: 6170846557819681638, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7100723655998593905, guid: e362d21003c2f684ba044af67b122094, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.998
@@ -332240,6 +332256,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8025827519092539881, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: randomSeed
+      value: 8703
+      objectReference: {fileID: 0}
+    - target: {fileID: 8025827519092539881, guid: e362d21003c2f684ba044af67b122094, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -359778,6 +359802,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6100924131400922851, guid: 03de1747a26aee94da5d6e2aa2ee4b03, type: 3}
+      propertyPath: randomSeed
+      value: 5157
+      objectReference: {fileID: 0}
+    - target: {fileID: 6100924131400922851, guid: 03de1747a26aee94da5d6e2aa2ee4b03, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7036358892822395403, guid: 03de1747a26aee94da5d6e2aa2ee4b03, type: 3}
       propertyPath: m_Name
       value: fx_gf1302_sf_q1

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);