Browse Source

修改bug

lzx 14 hours ago
parent
commit
b4a5aa8d64

+ 1 - 1
Assets/Scripts/Core/UI/Core/UIPanel.cs

@@ -219,7 +219,7 @@ namespace Fort23.Mono
         }
 
 
-        //public CTask CloseAwaitTask;
+        public CTask CloseAwaitTask;
         /// <summary>
         /// 关闭界面
         /// </summary>

+ 1 - 1
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -48,7 +48,7 @@ namespace Fort23.Mono
             Btn_Back.onClick.AddListener(() =>
             {
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
-                currentOpenUIPanel = null;
+                // currentOpenUIPanel = null;
             });
         }
 

+ 2 - 3
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -141,6 +141,7 @@ namespace Fort23.Mono
                     {
                         daoYouData.loveIds.Add(daoyouGiftConfig.ItemID);
                     }
+
                     //加经验
                     for (int i = 0; i < count; i++)
                     {
@@ -148,8 +149,6 @@ namespace Fort23.Mono
                         daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f);
                     }
 
-           
-
 
                     DaoyouLevelupConfig[] configs = ConfigComponent.Instance.GetAll<DaoyouLevelupConfig>();
 
@@ -389,7 +388,7 @@ namespace Fort23.Mono
             foreach (var itemInfo in shownItems)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, GiveGiftContent);
-                widgetItem.InitWidget(itemInfo);
+                widgetItem.InitWidget(itemInfo, false);
                 widgetItem.OnClick = OnClick;
                 giveWidgetItems.Add(widgetItem);
             }

+ 6 - 1
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -13,6 +13,7 @@ namespace Fort23.Mono
     public partial class WidgetItem : ItemWidgetBasic
     {
         public ItemInfo itemInfo;
+        public bool isClick = false;
 
 
         private void Init()
@@ -31,6 +32,8 @@ namespace Fort23.Mono
         {
             Btn_WidgetItem.onClick.AddListener(() =>
             {
+                if(!isClick)
+                    return;
                 if (itemInfo.config.associateID == 3)
                 {
        
@@ -50,8 +53,9 @@ namespace Fort23.Mono
         }
 
 
-        public void InitWidget(ItemInfo itemInfo)
+        public void InitWidget(ItemInfo itemInfo,bool isclick = true)
         {
+            this.isClick = isclick;
             this.itemInfo = itemInfo;
 
             icon.gameObject.SetActive(true);
@@ -71,6 +75,7 @@ namespace Fort23.Mono
 
         public void ShowWenhao()
         {
+            isClick = false;
             Icon_WenHao.gameObject.SetActive(true);
             icon.gameObject.SetActive(false);
             Text_Count.gameObject.SetActive(false);

File diff suppressed because it is too large
+ 403 - 458
UserSettings/Layouts/default-2022.dwlt


Some files were not shown because too many files changed in this diff