商店添加导航栏道具可配置

Assets/Res/Config/ShopGroupConfig.json

@@ -4,37 +4,55 @@
       "ID": 1,
       "shopName": 1900,
       "pageSortNum": 2,
-      "isShow": true
+      "isShow": true,
+      "titleShowItemIds": [
+        1004
+      ]
     },
     {
       "ID": 2,
       "shopName": 1904,
       "pageSortNum": 4,
-      "isShow": true
+      "isShow": true,
+      "titleShowItemIds": [
+        1004
+      ]
     },
     {
       "ID": 3,
       "shopName": 1905,
       "pageSortNum": 5,
-      "isShow": true
+      "isShow": true,
+      "titleShowItemIds": [
+        1004
+      ]
     },
     {
       "ID": 4,
       "shopName": 10106,
       "pageSortNum": 1,
-      "isShow": true
+      "isShow": true,
+      "titleShowItemIds": [
+        1004
+      ]
     },
     {
       "ID": 5,
       "shopName": 10106,
       "pageSortNum": 6,
-      "isShow": false
+      "isShow": false,
+      "titleShowItemIds": [
+        1004
+      ]
     },
     {
       "ID": 6,
       "shopName": 10330,
       "pageSortNum": 3,
-      "isShow": true
+      "isShow": true,
+      "titleShowItemIds": [
+        1004
+      ]
     }
   ]
 }

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -3035,7 +3035,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scripts/GameData/ExcelConfig/ShopGroupConfig.cs

@@ -54,6 +54,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///导航栏显示的道具
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] titleShowItemIds;
+#else
+		public int[] titleShowItemIds{ set; get; }
+#endif
+		
+
 	}
 
 }

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

@@ -103,6 +103,8 @@ namespace Fort23.Mono
 
         public async void Bnt_ShengShi_Click()
         {
+      
+
             await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); });
         }
 
@@ -198,15 +200,6 @@ namespace Fort23.Mono
 
         private async void Bnt_shengShi_onClick(int count, List<ItemInfo> useItems)
         {
-            if (AccountFileInfo.Instance.playerData.divineSensePoint <
-                PlayerManager.Instance.gameConstantConfig.DetectEventCount)
-            {
-                await DivineSenceRestoredPanel.OpenPanel();
-                // await TipMessagePanel.OpenTipMessagePanel("神识值不够！");
-                return;
-            }
-            
-
             if (count == 0)
             {
                 return;
@@ -323,7 +316,7 @@ namespace Fort23.Mono
             }
 
             appBarPanel.CustomInit(uiPanel);
-            
+
             RedDotManager.Instance.AllRedDotUpDate();
         }
 

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

@@ -36,6 +36,11 @@ namespace Fort23.Mono
             return base.GetFocus();
         }
 
+        public override CTask LoseFocus()
+        {
+            return base.LoseFocus();
+        }
+
         protected override void AddEvent()
         {
         }
@@ -55,6 +60,13 @@ namespace Fort23.Mono
                     return;
                 }
 
+                if (AccountFileInfo.Instance.playerData.divineSensePoint <
+                    PlayerManager.Instance.gameConstantConfig.DetectEventCount)
+                {
+                    DivineSenceRestoredPanel.OpenPanel();
+                    return;
+                }
+
                 useItems.Clear();
                 foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
                 {
@@ -65,6 +77,7 @@ namespace Fort23.Mono
                 }
 
                 callback?.Invoke(useCount, useItems);
+                GObjectPoolInterface.SetActive(false);
                 // UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
@@ -76,6 +89,7 @@ namespace Fort23.Mono
             Btn_Event.onClick.AddListener(async () =>
             {
                 await DivineSenceEventPreviewPanel.OpenPanel();
+                GObjectPoolInterface.SetActive(false);
                 // UIManager.Instance.HideUIUIPanel(this, isBreadcrumbBarPanel: false);
             });
         }
@@ -85,7 +99,7 @@ namespace Fort23.Mono
             useCount = (int)value;
             Text_Count.text = LanguageManager.Instance.Text(10253, value);
             // Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}<color=green>+{value}</color>/{maxCount})";
-            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() }/{maxCount})";
+            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}/{maxCount})";
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
                 senceInfoBtnWidget.UpdateItermCount(useCount);

Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -42,7 +42,7 @@ namespace Fort23.Mono
 
         public override CTask GetFocus()
         {
-            TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
+         
             AppBarPanel.OpenPanel(this);
 
             return base.GetFocus();
@@ -89,6 +89,7 @@ namespace Fort23.Mono
         private async void OnClick(ItemWidgetBasic obj)
         {
             ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;
+            TitlePanel.OpenPanel(shopBtnWidget.ShopGroupConfig.titleShowItemIds.ToList());
             Text_Title.text = LanguageManager.Instance.Text(shopBtnWidget.ShopGroupConfig.shopName);
             ShopBtnContent.GetComponent<UIToggleList>()
                 .ClickWidget(shopBtnWidget.own.GetComponent<UIToggleWidgetBasic>());