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

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -634,14 +634,17 @@ namespace Fort23.Mono
                         RefreshFull();
 
 
-                        // if (isShowBG)
-                        // {
-                        //   
-                        //     uiPanel.IsShowCustomBGPanel = true;
-                        //     if (!AllShowBGUIs.Contains(uiPanel))
-                        //         AllShowBGUIs.Add(uiPanel);
-                        //     await GetBackgroundPanel(uiPanel, GetLayer(layer));
-                        // }
+                        if (isShowBG)
+                        {
+                            var popupPanel = GetComponent(BackgroundPanelType) as UIPanel;
+                            // popupPanel.transform.SetAsFirstSibling();
+                            int index01 = uiPanel.GObjectPoolInterface.transform.GetSiblingIndex();
+                            popupPanel.transform.SetSiblingIndex(index01 - 1);
+                            // uiPanel.IsShowCustomBGPanel = true;
+                            // if (!AllShowBGUIs.Contains(uiPanel))
+                            //     AllShowBGUIs.Add(uiPanel);
+                            // await GetBackgroundPanel(uiPanel, GetLayer(layer));
+                        }
 
                         return uiPanel;
                     }
@@ -1344,7 +1347,7 @@ namespace Fort23.Mono
             }
 
             popupPanel.transform.SetParent(parent, false);
-            popupPanel.transform.SetAsFirstSibling();
+            // popupPanel.transform.SetAsFirstSibling();
             int index01 = uiPanel.GObjectPoolInterface.transform.GetSiblingIndex();
             // popupPanel.transform.SetParent(parent, false);
 

Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2.cs

@@ -43,11 +43,11 @@ namespace Fort23.Mono
                     itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemInfo.config.associateVlaue[0]);
                     Icon_SuiPian.gameObject.SetActive(true);
                     Text_Count.text = $"x{itemInfo.config.associateVlaue[2]}";
-                    Icon_New.gameObject.SetActive(true);
                 }
                 else
                 {
                     Icon_SuiPian.gameObject.SetActive(false);
+                    Icon_New.gameObject.SetActive(true);
                 }
             }
             //功法
@@ -62,11 +62,12 @@ namespace Fort23.Mono
                     itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemInfo.config.associateVlaue[0]);
                     Icon_SuiPian.gameObject.SetActive(true);
                     Text_Count.text = $"x{itemInfo.config.associateVlaue[2]}";
-                    Icon_New.gameObject.SetActive(true);
+                    // Icon_New.gameObject.SetActive(true);
                 }
                 else
                 {
                     Icon_SuiPian.gameObject.SetActive(false);
+                    Icon_New.gameObject.SetActive(true);
                 }
             }
             else

Assets/Scripts/GameUI/UI/RewardsPanel/RewardsPanel.cs

@@ -13,6 +13,8 @@ namespace Fort23.Mono
     {
         private void Init()
         {
+            isAddStack = true;
+            IsShowAppBar = false;
         }
 
         protected override void AddEvent()