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

Assets/Scripts/GameUI/UI/CombatPanel/WuXingGongFaWidget.cs

@@ -95,7 +95,7 @@ namespace Fort23.Mono
 
                 if (isFengShuo)
                 {
-                    fengjingXX.SetActive(true);
+                    fengjingXX?.SetActive(true);
                 }
             }
         }
@@ -149,7 +149,7 @@ namespace Fort23.Mono
 
                 if (isFengShuo)
                 {
-                    fengjingXX.SetActive(false);
+                    fengjingXX?.SetActive(false);
                 }
             }
         }
@@ -160,7 +160,7 @@ namespace Fort23.Mono
 
         public void ShowWidget(int index)
         {
-            fengjingXX.SetActive(false);
+            fengjingXX?.SetActive(false);
             this.index = index;
             switch (index)
             {

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -341,8 +341,8 @@ namespace Fort23.Mono
 
         public void Update()
         {
-            if (EventSystemManager.Instance.isOpenUi && eventConditionConfig.ID != 0)
-                return;
+            // if (EventSystemManager.Instance.isOpenUi && eventConditionConfig.ID != 0)
+            //     return;
 
             if (!_isUpdate) return;