修改bug

Assets/Art/UIAssets/decorate/dec_xx.png.meta

@@ -0,0 +1,189 @@
+fileFormatVersion: 2
+guid: XCxL5iirBXLwMK+TM+zgdBH71m/CBk7nbQLK5ycm2blCmxcAYzlMiMX3MXRV
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/CombatPanel.prefab

@@ -6495,7 +6495,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &9509282572708107
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6509,6 +6509,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9139992225939067259}
+  - {fileID: 2837458149260545399}
   - {fileID: 2775998673178769861}
   - {fileID: 6749346514664486305}
   - {fileID: 8350554666317869367}
@@ -6663,6 +6664,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: fengjingXX
+    gameObject: {fileID: 7358063813765322005}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &6403006887241105223
 GameObject:
@@ -7467,6 +7473,94 @@ RectTransform:
   m_AnchoredPosition: {x: 0.4, y: -31.3}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7358063813765322005
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2837458149260545399}
+  - component: {fileID: 3883764775078496040}
+  - component: {fileID: 4868698707362920285}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fengjingXX
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2837458149260545399
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7358063813765322005}
+  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: 9509282572708107}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  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: 70, y: 63}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3883764775078496040
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7358063813765322005}
+  m_CullTransparentMesh: 1
+--- !u!114 &4868698707362920285
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7358063813765322005}
+  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: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xx
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: d6f50d2b7b6e4b0b7542e03171e0215b
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7790788168690589102
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/battle.spriteatlasv2

@@ -32,6 +32,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 9420c6149c9ecea40829470293c18bf1, type: 3}
     - {fileID: 2800000, guid: 9ac1dd853c797664ea29abf0ecc80281, type: 3}
     - {fileID: 2800000, guid: 0016a6e8804cc5c45875bea2cbedc155, type: 3}
+    - {fileID: 2800000, guid: cfdc26f9f4c83eb43be87ac463c4720c, type: 3}
     - {fileID: 2800000, guid: 3ebef0b933c6a884a9443eb76c68048a, type: 3}
     - {fileID: 2800000, guid: 11a050c820c03994a83b8d5cb60e55b8, type: 3}
     - {fileID: 2800000, guid: c3e90883db7078b42966fd3e59cb5bbc, type: 3}

Assets/Scripts/GameLogic/Combat/Buff/b_1019.cs

@@ -0,0 +1,9 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 筋脉封锁金
+    /// </summary>
+    public class b_1019 : BuffBasic
+    {
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1019.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 284c85fa5e4344e593ddd820f556c770
+timeCreated: 1751275402

Assets/Scripts/GameLogic/Combat/Buff/b_1020.cs

@@ -0,0 +1,9 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 筋脉封锁木
+    /// </summary>
+    public class b_1020: BuffBasic
+    {
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1020.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c6b75fc8b6a7452bb0c53bf1d83784d0
+timeCreated: 1751275750

Assets/Scripts/GameLogic/Combat/Buff/b_1021.cs

@@ -0,0 +1,9 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 筋脉封锁水
+    /// </summary>
+    public class b_1021: BuffBasic
+    {
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1021.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4c671e2e9ff944db8ccc8aa2006adaef
+timeCreated: 1751275756

Assets/Scripts/GameLogic/Combat/Buff/b_1022.cs

@@ -0,0 +1,9 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 筋脉封锁火
+    /// </summary>
+    public class b_1022: BuffBasic
+    {
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1022.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 087e56f7559d4dc2b7049403c9293f30
+timeCreated: 1751275763

Assets/Scripts/GameLogic/Combat/Buff/b_1023.cs

@@ -0,0 +1,9 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 筋脉封锁土
+    /// </summary>
+    public class b_1023 : BuffBasic
+    {
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1023.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6ce38dfaa4b34f89a3ad29ede32903cf
+timeCreated: 1751275768

Assets/Scripts/GameLogic/Combat/Buff/b_1024.cs

@@ -0,0 +1,7 @@
+namespace GameLogic.Combat.Buff
+{
+    public class b_1024
+    {
+        
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1024.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fed92c42879b4933aeb732897d826b31
+timeCreated: 1751275773

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
 using Fort23.Core;
+using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Skill;
 using GameLogic.Player;
@@ -30,7 +31,8 @@ namespace Fort23.Mono
             CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, UseSkill);
             CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkillFinish, UseSkillFinish);
             CombatEventManager.Instance.AddEventListener(CombatEventType.FillInSkillSlots, FillInSkillSlots);
-          
+            CombatEventManager.Instance.AddEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.RemoveBuff, RemoveBuff);
         }
 
         public override void DelEvent()
@@ -40,7 +42,116 @@ namespace Fort23.Mono
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkill, UseSkill);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkillFinish, UseSkillFinish);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.FillInSkillSlots, FillInSkillSlots);
-      
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.RemoveBuff, RemoveBuff);
+        }
+
+        private void AddBuff(IEventData iEventData)
+        {
+            BuffEventData buffEventData = iEventData as BuffEventData;
+            if (CombatController.currActiveCombat
+                    .playerHeroEntity == buffEventData.target)
+            {
+                bool isFengShuo = false;
+                switch (huangDaoWuXingType)
+                {
+                    case WuXingType.Gold:
+                        if (buffEventData.BuffBasic is b_1019)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                    case WuXingType.Water:
+                        if (buffEventData.BuffBasic is b_1021)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                    case WuXingType.Wood:
+
+                        if (buffEventData.BuffBasic is b_1020)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                    case WuXingType.Fire:
+                        if (buffEventData.BuffBasic is b_1022)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                    case WuXingType.Earth:
+                        if (buffEventData.BuffBasic is b_1023)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                }
+
+                if (isFengShuo)
+                {
+                    fengjingXX.SetActive(true);
+                }
+            }
+        }
+
+        private void RemoveBuff(IEventData iEventData)
+        {
+            BuffEventData buffEventData = iEventData as BuffEventData;
+            if (CombatController.currActiveCombat
+                    .playerHeroEntity == buffEventData.target)
+            {
+                bool isFengShuo = false;
+                switch (huangDaoWuXingType)
+                {
+                    case WuXingType.Gold:
+                        if (buffEventData.BuffBasic is b_1019)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                    case WuXingType.Water:
+                        if (buffEventData.BuffBasic is b_1021)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                    case WuXingType.Wood:
+
+                        if (buffEventData.BuffBasic is b_1020)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                    case WuXingType.Fire:
+                        if (buffEventData.BuffBasic is b_1022)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                    case WuXingType.Earth:
+                        if (buffEventData.BuffBasic is b_1023)
+                        {
+                            isFengShuo = true;
+                        }
+
+                        break;
+                }
+
+                if (isFengShuo)
+                {
+                    fengjingXX.SetActive(false);
+                }
+            }
         }
 
         public override void AddButtonEvent()
@@ -49,18 +160,19 @@ namespace Fort23.Mono
 
         public void ShowWidget(int index)
         {
+            fengjingXX.SetActive(false);
             this.index = index;
             switch (index)
             {
                 case 0:
-                    huangDaoWuXingType= WuXingType.Gold;
+                    huangDaoWuXingType = WuXingType.Gold;
                     myImage.icon_name = "dec_jin";
                     // Name.text = "金";
                     // myImage.color = new Color(1f, 0.98f, 0.09f);
                     break;
                 case 1:
                     // Name.text = "水";
-                    huangDaoWuXingType= WuXingType.Water;
+                    huangDaoWuXingType = WuXingType.Water;
                     // myImage.color = new Color(0.19f, 0.51f, 1f);
                     myImage.icon_name = "dec_shui";
                     break;
@@ -68,24 +180,23 @@ namespace Fort23.Mono
                     // Name.text = "木";
                     // myImage.color = new Color(0.17f, 1f, 0.35f);
                     myImage.icon_name = "dec_mu";
-                    huangDaoWuXingType= WuXingType.Wood;
+                    huangDaoWuXingType = WuXingType.Wood;
                     break;
                 case 3:
                     // Name.text = "火";
                     // myImage.color = new Color(1f, 0.19f, 0.04f);
                     myImage.icon_name = "dec_huo";
-                    huangDaoWuXingType= WuXingType.Fire;
+                    huangDaoWuXingType = WuXingType.Fire;
                     break;
                 case 4:
                     // Name.text = "土";
                     // myImage.color = new Color(1f, 0.65f, 0.17f);
                     myImage.icon_name = "dec_tu";
-                    huangDaoWuXingType= WuXingType.Earth;
+                    huangDaoWuXingType = WuXingType.Earth;
                     break;
             }
         }
 
-      
 
         private void FillInSkillSlots(IEventData iEventData)
         {

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

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