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

Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -177,7 +177,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3563, y: -182}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8965272612517638377
 MonoBehaviour:
@@ -389,7 +389,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1050,7 +1050,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1318,7 +1318,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 0.32941177}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1954,7 +1954,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2479,7 +2479,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.98823535, g: 0.93725497, b: 0.8235295, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -1895,7 +1895,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10237
+  id: 10798
 --- !u!1 &2720669039826339307
 GameObject:
   m_ObjectHideFlags: 0
@@ -3242,7 +3242,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4352261052017720437
 RectTransform:
   m_ObjectHideFlags: 0

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

@@ -111,15 +111,15 @@ namespace Fort23.Mono
             await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); });
         }
 
-        public async void Btn_Shop_Click(int shopId = 0)
+        public async void Btn_Shop_Click(int shopId = 0,bool isQz = false)
         {
             CloseMenu();
-            if (currentOpenUIPanel is ShopPanel)
+            if (currentOpenUIPanel is ShopPanel && !isQz)
             {
                 return;
             }
 
-
+    
             UIPanel uiPanel = currentOpenUIPanel;
 
             CombatDrive.Instance.CombatController.isUpdate = false;
@@ -127,7 +127,11 @@ namespace Fort23.Mono
             if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
                 uiPanel is MainHeroPanel)
             {
-                UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
+                if (!(currentOpenUIPanel is ShopPanel))
+                {
+                     UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
+                }
+               
             }
 
             if (!shopPanel.IsClose)

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

@@ -97,6 +97,23 @@ namespace Fort23.Mono
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             shopId = int.Parse(uiData[0].ToString());
+            
+            foreach (var shopGroupWidgetType1 in _shopGroupWidgetType1s)
+            {
+                UIManager.Instance.DormancyGComponent(shopGroupWidgetType1);
+            }
+
+            _shopGroupWidgetType1s.Clear();
+  
+
+            foreach (var shopBtnWidget in _shopBtnWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(shopBtnWidget);
+            }
+
+            _shopBtnWidgets.Clear();
+            currentSelectedShopBtnWidget = null;
+            
             List<ShopGroupConfig> shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>().ToList();
             shopGroupConfigs.Sort(Sort);
             foreach (var shopGroupConfig in shopGroupConfigs)
@@ -250,12 +267,7 @@ namespace Fort23.Mono
             }
 
             _shopGroupWidgetType1s.Clear();
-            // foreach (var widget in _energyWidgets)
-            // {
-            //     UIManager.Instance.DormancyGComponent(widget);
-            // }
-            //
-            // _energyWidgets.Clear();
+  
 
             foreach (var shopBtnWidget in _shopBtnWidgets)
             {

Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -34,7 +34,7 @@ namespace Mono.Utility
                     return;
                 //商店界面
                 case 4:
-                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click(skiptoConfig.SkipArguments[0]);
+                    UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click(skiptoConfig.SkipArguments[0], true);
                     return;
                 //实用神识界面
                 case 5: