lzx 1 周之前
父节点
当前提交
d0cad94fba

+ 5 - 0
Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -524,6 +524,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Daoyou
+    gameObject: {fileID: 2328298552659041410}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &4309724099149842934
 MonoBehaviour:

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/ExpElixirItemWidget.prefab

@@ -689,7 +689,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 43.997498, y: -12.5}
-  m_SizeDelta: {x: 24, y: 23.1372}
+  m_SizeDelta: {x: 0, y: 23.1372}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7796567445027890541
 CanvasRenderer:

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3387,7 +3387,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 210, y: 43.2862}
+  m_SizeDelta: {x: 0, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/ImmortalBondPanel.prefab

@@ -2570,7 +2570,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

+ 2 - 1
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1305,8 +1305,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
             await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
         }
+        
 
-        if (PlayerGuideManager.Instance.GuideIsCanDo(2))
+        if (eventConfig.ID == 10001 && PlayerGuideManager.Instance.GuideIsCanDo(2))
         {
             PlayerGuideManager.Instance.SetGuid(2);
         }

+ 4 - 2
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -34,6 +34,7 @@ namespace Fort23.Mono
         {
             _daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(configId);
             _daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == configId);
+            Icon_Daoyou.icon_name = _daoyouModelConfig.bodyIcon;
 
             Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
             if (_daoYouData != null)
@@ -53,7 +54,7 @@ namespace Fort23.Mono
             {
                 Slider_Emotion.fillAmount = _daoYouData.emotionValue / 100;
             }
-           
+
 
             if (_daoYouData == null)
             {
@@ -74,7 +75,8 @@ namespace Fort23.Mono
 
                 Icon_Emotion.gameObject.SetActive(false);
 
-                DaoyouLevelupConfig daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(_daoYouData.favorabilityLv);
+                DaoyouLevelupConfig daoyouLevelupConfig =
+                    ConfigComponent.Instance.Get<DaoyouLevelupConfig>(_daoYouData.favorabilityLv);
                 Text_DaoyouLvName.text = LanguageManager.Instance.Text(daoyouLevelupConfig.name);
                 if (_daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
                     && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)

+ 11 - 0
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidgetData.cs

@@ -85,6 +85,17 @@ namespace Fort23.Mono
 	      return _Slider_Emotion;
 	     }
 	   }
+	  private MyImage _Icon_Daoyou;
+	  public MyImage Icon_Daoyou
+	   {
+	   get{
+	      if (_Icon_Daoyou == null)
+	       {
+	         _Icon_Daoyou  = GetUIUnit<MyImage>("Icon_Daoyou"); 
+	       }
+	      return _Icon_Daoyou;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 1 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/ImmortalBondPanel.cs

@@ -81,6 +81,7 @@ namespace Fort23.Mono
             {
                 DaoYouaaFfixWidget daoLvSkillWidget =
                     await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, JiachengContent);
+                daoLvSkillWidget.transform.localScale = Vector3.one;
                 daoLvSkillWidget.CustomInit(i);
                 _daoLvSkillWidgets.Add(daoLvSkillWidget);
             }

+ 6 - 1
Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -78,7 +78,12 @@ namespace Fort23.Mono
                 //     await PlayerGuideManager.Instance.SetGuid(8);
                 // }
 
-                if (PlayerGuideManager.Instance.GuideIsCanDo(4))
+                if (PlayerGuideManager.Instance.GuideIsCanDo(4) && PlayerManager.Instance.GongFaControl.allSkill
+                                                                    .FirstOrDefault(s =>
+                                                                        s.skillConfig.IDGroup == 1405) != null
+                                                                && PlayerManager.Instance.GongFaControl.allSkill
+                                                                    .FirstOrDefault(s =>
+                                                                        s.skillConfig.IDGroup == 2006) != null)
                 {
                     await PlayerGuideManager.Instance.SetGuid(4);
                 }