Merge remote-tracking branch 'origin/master'

Assets/Res/Config/LanguageChineseConfig.json

@@ -38378,7 +38378,7 @@
     },
     {
       "ID": 10335,
-      "txt": "0"
+      "txt": "神识事件已达到上限，请先完成后再试"
     },
     {
       "ID": 10336,

Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab

@@ -1652,7 +1652,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 215.4}
-  m_SizeDelta: {x: 0, y: 110.3}
+  m_SizeDelta: {x: 532.04, y: 110.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &278002706122496663
 CanvasRenderer:

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -205,10 +205,11 @@ namespace Fort23.Mono
                 await TipMessagePanel.OpenTipMessagePanel("神识值不够！");
                 return;
             }
+            
 
             if (count == 0)
             {
-                TipMessagePanel.OpenTipMessagePanel("背包数量不足！");
+                return;
             }
 
             EventSystemManager.Instance.CancelEvent();

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

@@ -48,6 +48,13 @@ namespace Fort23.Mono
         {
             Btn_Ok.onClick.AddListener(() =>
             {
+                if (EventSystemManager.Instance.GetShenShiCount() >=
+                    divineSenseConfig.MaxNum)
+                {
+                    TipMessagePanel.OpenTipMessagePanel(10335);
+                    return;
+                }
+
                 useItems.Clear();
                 foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
                 {