修改bug

Assets/Res/UI/DaoYouPanel/DaoYouIdleEarningsWidget.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 68.29999, y: 235.4986}
-  m_SizeDelta: {x: 107, y: 4}
+  m_SizeDelta: {x: 107, y: 40}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &566111804867399921
 CanvasRenderer:

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -1232,7 +1232,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 197.0892, y: -53}
+  m_AnchoredPosition: {x: 197.0892, y: -38}
   m_SizeDelta: {x: 394.1784, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8219955351092879517

Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -1043,7 +1043,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang
+  _icon_name: dec_juxing_yuanjiao16
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1225,7 +1225,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7555ba42c145339429e4c693ce3601d7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 03130e562c0aeca4383835e226fa650c, type: 3}
   m_Type: 0
   m_PreserveAspect: 1
   m_FillCenter: 1
@@ -1235,7 +1235,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_lh_wanxi
+  _icon_name: bg_lh_lingji
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -275,7 +275,7 @@ namespace GameLogic.Player
                             ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero
                                 .powerUpConfig.ID);
                         FieldInfo scoreField =
-                            resourceLevelConfig.GetType().GetField("value" + itemConfig.associateVlaue);
+                            resourceLevelConfig.GetType().GetField("value" + itemConfig.associateVlaue[0]);
                         int itemId = (int)scoreField.GetValue(resourceLevelConfig);
                         ItemInfo itemInfo = new ItemInfo(itemId, count);
                         itemInfos.Add(itemInfo);

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -561,7 +561,7 @@ namespace Fort23.Mono
                 Btn_Setting.gameObject.SetActive(true);
                 CloseSelect();
                 AppBarPanel.OpenPanel(this);
-                Text_FuZhuGongFaCount.transform.parent.gameObject.SetActive(false);
+                // Text_FuZhuGongFaCount.transform.parent.gameObject.SetActive(false);
             }
             else if (type == 2)
             {
@@ -570,7 +570,7 @@ namespace Fort23.Mono
                 allUseSkill = PlayerManager.Instance.GongFaControl.allUseSkill.ToArray();
                 Btn_Setting.gameObject.SetActive(false);
                 AppBarPanel.ClosePanel();
-                Text_FuZhuGongFaCount.transform.parent.gameObject.SetActive(true);
+                // Text_FuZhuGongFaCount.transform.parent.gameObject.SetActive(true);
             }
         }
 

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -88,18 +88,19 @@ namespace Fort23.Mono
 
             Btn_Eveent.onClick.AddListener(() =>
             {
-                if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
-                    && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
-                    && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
-                    && !EventSystemManager.Instance.IsEventCompleted(_daoyouModelConfig.QuestID))
-                {
-                    AccountFileInfo.EventList eventList =
-                        EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
-                    AccountFileInfo.Instance.playerData.eventList.Add(eventList);
-                    AccountFileInfo.Instance.SavePlayerData();
-                    EventSystemManager.Instance.TriggerEvent(eventList);
-                    Btn_Eveent.gameObject.SetActive(false);
-                }
+                TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10697, daoYouData.favorabilityLv));
+                // if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
+                //     && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
+                //     && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
+                //     && !EventSystemManager.Instance.IsEventCompleted(_daoyouModelConfig.QuestID))
+                // {
+                //     AccountFileInfo.EventList eventList =
+                //         EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
+                //     AccountFileInfo.Instance.playerData.eventList.Add(eventList);
+                //     AccountFileInfo.Instance.SavePlayerData();
+                //     EventSystemManager.Instance.TriggerEvent(eventList);
+                //     Btn_Eveent.gameObject.SetActive(false);
+                // }
             });
 
 
@@ -150,7 +151,16 @@ namespace Fort23.Mono
                     for (int i = 0; i < count; i++)
                     {
                         int bl = Random.Range(emotionConfig.hanganUpRate[0], emotionConfig.hanganUpRate[1] + 1);
-                        daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f);
+                        //喜好礼物翻倍
+                        if (_daoyouModelConfig.PreferGiftID.Contains(daoyouGiftConfig.ItemID))
+                        {
+                            daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f * PlayerManager.Instance.gameConstantConfig.daolvfavoratePara * 0.01f);
+                        }
+                        else
+                        {
+                            daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f);
+                        }
+                       
                     }
 
 
@@ -252,8 +262,7 @@ namespace Fort23.Mono
 
             daoYouaaFfixWidgets.Clear();
 
-            if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
-                && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
+            if (daoYouData.favorabilityLv != -1
                 && !EventSystemManager.Instance.IsEventCompleted(_daoyouModelConfig.QuestID))
             {
                 Btn_Eveent.gameObject.SetActive(true);

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInvitePanel.cs

@@ -64,6 +64,12 @@ namespace Fort23.Mono
             {
                 if (!PlayerManager.Instance.myHero.heroData.ImmortalBond.Contains(playerDataDaoYouData.id))
                 {
+                    DaoyouModelConfig daoyouModelConfig =
+                        ConfigComponent.Instance.Get<DaoyouModelConfig>(playerDataDaoYouData.id);
+                    if (playerDataDaoYouData.favorabilityLv == -1 || playerDataDaoYouData.favorabilityLv < daoyouModelConfig.EmotionLvforQuest || !EventSystemManager.Instance.IsEventCompleted(daoyouModelConfig.EventCompleteforQuest))
+                    {
+                        continue;
+                    }
                     count++;
                     DaoYouWidget daoYouWidget = await UIManager.Instance.CreateGComponent<DaoYouWidget>(null, Content);
                     daoYouWidget.CustomInit(playerDataDaoYouData.id);

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

@@ -212,6 +212,18 @@ namespace Fort23.Mono
                 for (var i = 0; i < randomEventConfig.PrizeIDs.Length; i++)
                 {
                     DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(randomEventConfig.PrizeIDs[i]);
+                    if (dropConfig.dropType == 3)
+                    {
+                        ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dropConfig.dropGroupID[0]);
+                        if (itemConfig.associateID == 14)
+                        {
+                            List<ItemInfo> itemInfoss = DropManager.Instance.Drop(randomEventConfig.PrizeIDs[i],
+                                randomEventConfig.PrizeNums[i]);
+                            itemInfos.AddRange(itemInfoss);
+                            continue;
+                        }
+                    }
+
                     if (dropConfig.showItemId != null)
                     {
                         foreach (var i1 in dropConfig.showItemId)