修改bug

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.22620928
+    - _Alpha: 0.14950955
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.18101776
+    - _MainTexOffsetU: 0.27650046
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/BuffWidget.prefab

@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8010645253974417761
 RectTransform:
   m_ObjectHideFlags: 0
@@ -84,6 +84,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\bufficon.txt
     packgSpritePath: Assets/Res/UIAtlas/bufficon.spriteatlasv2
     lasetJsonGUID: 7f52419e9eccce9658184e372261f4d5
+  imageH: -122222
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -106,7 +107,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2680680706263324575
 RectTransform:
   m_ObjectHideFlags: 0
@@ -147,7 +148,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.31132078, g: 0.3098523, b: 0.3098523, a: 1}
+  m_Color: {r: 0.41509432, g: 0.25649697, b: 0.25649697, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -172,6 +173,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 25
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -260,6 +262,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\bufficon.txt
     packgSpritePath: Assets/Res/UIAtlas/bufficon.spriteatlasv2
     lasetJsonGUID: 7f52419e9eccce9658184e372261f4d5
+  imageH: 25
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -275,7 +278,7 @@ GameObject:
   - component: {fileID: 7433295612686131427}
   - component: {fileID: 1238986821254646327}
   - component: {fileID: 4016156508120193148}
-  - component: {fileID: 8855732311597591477}
+  - component: {fileID: 721676737304932698}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: buffCount
@@ -293,7 +296,7 @@ RectTransform:
   m_GameObject: {fileID: 4312834638348961741}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.46974, y: 0.46974, z: 0.46974}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1874690903935274985}
@@ -301,7 +304,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: 30, y: 30}
+  m_SizeDelta: {x: 49.7, y: 33.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1238986821254646327
 CanvasRenderer:
@@ -324,7 +327,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9716981, g: 0.23375754, b: 0.23375754, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -333,7 +336,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
+    m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -344,8 +347,8 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 10
---- !u!114 &8855732311597591477
+  m_Text: 
+--- !u!114 &721676737304932698
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -354,12 +357,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 4312834638348961741}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &6934887617118568492
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillInfopanel.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &923156588986857331
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3575994812429690981}
+  - component: {fileID: 1156314413429277768}
+  - component: {fileID: 1688100452381119778}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_BuffIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3575994812429690981
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 923156588986857331}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1490485299211484798}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 38.1, y: -43.179}
+  m_SizeDelta: {x: 83, y: 83}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &1156314413429277768
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 923156588986857331}
+  m_CullTransparentMesh: 1
+--- !u!114 &1688100452381119778
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 923156588986857331}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_b1001
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: c81ee042921124b448aa8922499c0b7d, type: 3}
+  packInfo:
+    packName: bufficon
+    packgJsonPath: /Art/UIAssets/TextrueJson\bufficon.txt
+    packgSpritePath: Assets/Res/UIAtlas/bufficon.spriteatlasv2
+    lasetJsonGUID: 372b7db695572445f343ddc4b4767104
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &959975830485342132
 GameObject:
   m_ObjectHideFlags: 0
@@ -39,7 +128,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: 1624}
+  m_SizeDelta: {x: 1500, y: 3248}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5048528037997048130
 MonoBehaviour:
@@ -114,6 +203,16 @@ MonoBehaviour:
     - gameObject: {fileID: 7124841329176253432}
     - gameObject: {fileID: 534743054050646405}
     - gameObject: {fileID: 8307814055743465005}
+  - key: Icon_BuffIcon
+    gameObject: {fileID: 1688100452381119778}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7143455120279600479}
+    - gameObject: {fileID: 6452252745516188510}
+    - gameObject: {fileID: 7124841329176253432}
+    - gameObject: {fileID: 534743054050646405}
+    - gameObject: {fileID: 8307814055743465005}
   isAssetBundle: 1
 --- !u!225 &4114640352870270046
 CanvasGroup:
@@ -511,6 +610,7 @@ RectTransform:
   m_Children:
   - {fileID: 3849278629804045308}
   - {fileID: 4555844957164556483}
+  - {fileID: 3575994812429690981}
   - {fileID: 6122583032657971884}
   - {fileID: 8822711238517633434}
   - {fileID: 8697082098443950979}

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

@@ -1,6 +1,8 @@
 using Common.Utility.CombatEvent;
 using Fort23.Core;
 using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Skill;
 
 namespace Fort23.Mono
 {
@@ -30,11 +32,15 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            myButton.onClick.AddListener(() =>
-            {
-                SkillMassgePanel.OpenSkillSelectPanel(buffBasic.BuffConfig.nameTest,
-                    buffBasic.BuffConfig.decTest);
-            });
+            myButton.onClick.AddListener(CkickBuff);
+        }
+
+        private async void CkickBuff()
+        {
+            CombatController.currActiveCombat.isUpdate = false;
+
+            SkillInfopanel skillInfopanel = await SkillInfopanel.OpenPanle(buffBasic);
+            skillInfopanel.UIClosed(() => { CombatController.currActiveCombat.isUpdate = true; });
         }
 
         private async void AddBuff(IEventData iEventData)
@@ -48,7 +54,7 @@ namespace Fort23.Mono
 
         public bool Update()
         {
-            if (buffBasic == null||buffBasic.CombatHeroEntity==null)
+            if (buffBasic == null || buffBasic.CombatHeroEntity == null)
             {
                 return false;
             }
@@ -69,6 +75,7 @@ namespace Fort23.Mono
         public void InitBuff(BuffBasic buffBasic)
         {
             this.buffBasic = buffBasic;
+            buffIcon.icon_name = buffBasic.BuffConfig.icon;
         }
     }
 }

Assets/Scripts/GameUI/UI/SkillInfopanel.cs

@@ -1,6 +1,7 @@
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
+using GameLogic.Combat.Buff;
 using GameLogic.Hero;
 using UnityEngine.UI;
 using Utility;
@@ -29,6 +30,8 @@ namespace Fort23.Mono
 
         public void CustomInit(FaBaoInfo faBaoInfo)
         {
+            Icon_BuffIcon.gameObject.SetActive(false);
+            Icon_SkillIcon.gameObject.SetActive(true);
             Text_Name.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name);
             Text_Level.text = "等级：" + faBaoInfo.FaBaoData.level.ToString();
             Text_Tag.text = "法宝";
@@ -67,6 +70,8 @@ namespace Fort23.Mono
         
         public void CustomInit(SkillInfo skillInfo)
         {
+            Icon_BuffIcon.gameObject.SetActive(false);
+            Icon_SkillIcon.gameObject.SetActive(true);
             Text_Name.text = LanguageManager.Instance.Text(skillInfo.skillConfig.name);
             Text_Level.text = "等级：" + skillInfo.SkillPowerupConfig.ID.ToString();
             Text_Tag.text = "功法";
@@ -90,6 +95,21 @@ namespace Fort23.Mono
             }
         }
 
+        public void CustomInit(BuffBasic buffBasic)
+        {
+            Icon_BuffIcon.gameObject.SetActive(true);
+            Icon_SkillIcon.gameObject.SetActive(false);
+            Text_Name.text = LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
+            Text_Level.text = "层数：" +buffBasic.buffCount;
+            Text_Tag.text = "buff";
+            Text_tip.text = "详情：";
+            Text_Power.text = $"";
+            Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(buffBasic.BuffConfig.buffEffectDes), buffBasic.BuffConfig.effectValue);
+            Text_Power.gameObject.SetActive(true);
+            StarRootGam.SetActive(false);
+            Icon_BuffIcon.icon_name = buffBasic.BuffConfig.icon;
+        }
+
         public static async CTask<SkillInfopanel> OpenPanle(FaBaoInfo faBaoInfo)
         {
             SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
@@ -103,5 +123,11 @@ namespace Fort23.Mono
             skillInfopanel.CustomInit(faBaoInfo);
             return skillInfopanel;
         }
+        public static async  CTask<SkillInfopanel> OpenPanle(BuffBasic faBaoInfo)
+        {
+            SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
+            skillInfopanel.CustomInit(faBaoInfo);
+            return skillInfopanel;
+        }
     }
 }

Assets/Scripts/GameUI/UI/SkillInfopanelData.cs

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