Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Res/UI/CombatShowTextPanel.prefab

@@ -117,7 +117,7 @@ RectTransform:
   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: 50}
+  m_AnchoredPosition: {x: 30, y: 40}
   m_SizeDelta: {x: 160, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2102639180733592827
@@ -307,7 +307,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxDuration: 0
   isUpdate: 0
-  currTime: 0.5044075
+  currTime: 0.50041944
   GrpupInfos:
   - Foldout: 1
     isActive: 0
@@ -321,6 +321,18 @@ MonoBehaviour:
     maxDuration: 0.5
     isUpdate: 1
     currTime: 0
+  - Foldout: 1
+    isActive: 0
+    animName: buffshow
+    isLoop: 0
+    allTargets:
+    - {fileID: 4917272975779495115}
+    - {fileID: 4917272975779495115}
+    TweenAssetInfo: {fileID: 11400000, guid: 920d0cf081a3e5e4b8f7c3dd0719a861, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.5
+    isUpdate: 1
+    currTime: 0
   MinMaxGradient:
     m_Mode: 0
     m_GradientMin:

Assets/Res/UIAnimRes/TweenAssetInfoShowTextWidget_1.asset

@@ -0,0 +1,202 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81c305ba541a4659ad97bd292322e9b3, type: 3}
+  m_Name: TweenAssetInfoShowTextWidget_1
+  m_EditorClassIdentifier: 
+  allTweenInfo:
+  - Foldout: 1
+    TweenType: 0
+    duration: 0.5
+    delay: 0
+    TweenBasic:
+      Foldout: 1
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos:
+      - TweenRectTransformType: 0
+        TweenLerpType: 1
+        Start: {x: 0, y: 0, z: 0}
+        End: {x: 0, y: 0, z: 0}
+        startX:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 0
+            inSlope: 31.389366
+            outSlope: 31.389366
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.09166667
+          - serializedVersion: 3
+            time: 1
+            value: 30
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startY:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 0
+            inSlope: 40
+            outSlope: 40
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 40
+            inSlope: 40
+            outSlope: 40
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startZ:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 0
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 0
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenPlayFx:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+  - Foldout: 1
+    TweenType: 1
+    duration: 0.5
+    delay: 0
+    TweenBasic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos: []
+    TweenCanvasGroup:
+      Foldout: 1
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 1
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: -0.019639678
+          outSlope: -0.019639678
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0.25836584
+        - serializedVersion: 3
+          time: 0.9335078
+          value: 0.82238233
+          inSlope: -0.5701334
+          outSlope: -0.5701334
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.16533463
+          outWeight: 0.5158001
+        - serializedVersion: 3
+          time: 1
+          value: 0
+          inSlope: -3.3962235
+          outSlope: -3.3962235
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.12912008
+          outWeight: 0
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenPlayFx:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0

Assets/Res/UIAnimRes/TweenAssetInfoShowTextWidget_1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Bngf4Sr+BXvc++P3qj2IaH+9T9ssm9D6BbKd+z0/c1TIsNR4Bla7PfOt0Hj7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -21,7 +21,7 @@ namespace GameLogic.Combat.Buff
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.attack.Value, harmbl);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                    WuXingType.Null);
+                    WuXingType.Null,HarmType.Buff);
             }
         }
 

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

@@ -28,7 +28,7 @@ namespace GameLogic.Combat.Buff
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.attack.Value, harmbl);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                    WuXingType.Fire);
+                    WuXingType.Fire,HarmType.Buff);
             }
         }
 

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -162,6 +162,7 @@ namespace GameLogic.Combat.CombatTool
         public HarmReturnInfo Recover(CombatHeroEntity source, CombatHeroHitPoint target, long att,
             AttType attType, HarmType harmType, TriggerData triggerData)
         {
+            harmType |= HarmType.Recover;
             HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
             harmReturnInfo.source = source;
             harmReturnInfo.target = target;
@@ -169,6 +170,7 @@ namespace GameLogic.Combat.CombatTool
             harmReturnInfo.attType = attType;
             harmReturnInfo.harmType = harmType;
             harmReturnInfo.triggerData = triggerData;
+            
             if (target.combatHeroEntity.isDie)
             {
                 return harmReturnInfo;
@@ -302,8 +304,8 @@ namespace GameLogic.Combat.CombatTool
         }
         public void FaBaoPengZhuang(CombatMagicWeaponEntity a, CombatMagicWeaponEntity b)
         {
-            CombatHeroEntity heroEntityA= a.MagicWeaponControl.combatHeroEntity;
-            CombatHeroEntity heroEntityB = b.MagicWeaponControl.combatHeroEntity;
+            CombatHeroEntity heroEntityA= a.RootMagicWeaponControl.combatHeroEntity;
+            CombatHeroEntity heroEntityB = b.RootMagicWeaponControl.combatHeroEntity;
             int myRestrained = GetRestrained(a.WuXingType, b.WuXingType);
             int targetRestrained = GetRestrained(b.WuXingType,a.WuXingType);
             float lg_a = heroEntityA.CurrCombatHeroInfo.GetWuXingShuXing(a.WuXingType);

Assets/Scripts/GameLogic/Combat/CombatTool/HarmType.cs

@@ -15,5 +15,17 @@ namespace GameLogic.Combat.CombatTool
         /// 暴击了
         /// </summary>
         BaoJi=4,
+        /// <summary>
+        /// 护盾 性伤害
+        /// </summary>
+        Shields=8,
+        /// <summary>
+        /// buff性伤害
+        /// </summary>
+        Buff=16,
+        /// <summary>
+        /// 恢复
+        /// </summary>
+        Recover=32,
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -43,7 +43,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
     public float DisTime;
 
-    public MagicWeaponControl MagicWeaponControl;
+    public MagicWeaponControl heroMagicWeaponControl;
 
     public float HpBl
     {
@@ -106,7 +106,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         // }
 
         poolInterface.own.SetActive(false);
-        MagicWeaponControl = new MagicWeaponControl();
+        heroMagicWeaponControl = new MagicWeaponControl();
         combatHeroTimeLineControl = new CombatHeroTimeLineControl();
         combatHeroTimeLineControl.Init(this);
         AssetHandle assetHandle =
@@ -169,7 +169,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
             EventManager.Instance.Dispatch(CustomEventType.CreateHeroHp, createHeroHpEventData);
         }
 
-        await MagicWeaponControl.InitMagicWeapon(this,isPlayer);
+        await heroMagicWeaponControl.InitMagicWeapon(this,isPlayer);
 
         callBack?.Invoke(this);
 #endif
@@ -185,7 +185,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         combatHeroAnimtion.Update(t);
         combatHeroGameObject.Update(t);
         BuffControl.Update(t);
-        MagicWeaponControl?.Update(t);
+        heroMagicWeaponControl?.Update(t);
         if (combatHeroGameObject.HeroGPUMono != null)
         {
             if (_injuriedShowTime > 0)
@@ -296,7 +296,8 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         if (shieldsBarrier!=null)
         {
              shieldsBarrier.Harm(harmReturnInfo);
-        
+             harmReturnInfo.harmType |= HarmType.Shields;
+
         }
         else
         {

Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -47,11 +47,11 @@ namespace GameLogic.Combat.Hero
         /// </summary>
         public bool isCombatState;
 
-        private MagicWeaponControl _magicWeaponControl;
+        private MagicWeaponControl _rootMagicWeaponControl;
 
-        public MagicWeaponControl MagicWeaponControl
+        public MagicWeaponControl RootMagicWeaponControl
         {
-            get { return _magicWeaponControl; }
+            get { return _rootMagicWeaponControl; }
         }
 
         private BetterList<SkillBasic> allSkill = new BetterList<SkillBasic>();
@@ -81,7 +81,7 @@ namespace GameLogic.Combat.Hero
         {
             this._faBaoInfo = faBaoInfo;
             this.magicWeaponConfig = faBaoInfo.FabaoConfig;
-            this._magicWeaponControl = magicWeaponControl;
+            this._rootMagicWeaponControl = magicWeaponControl;
             string modelName = magicWeaponConfig.model;
 
             cd = magicWeaponConfig.cd;
@@ -158,7 +158,7 @@ namespace GameLogic.Combat.Hero
 
         public void UseMagicWeapon()
         {
-            if (cd > 0 || _magicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget == null)
+            if (cd > 0 || _rootMagicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget == null)
             {
                 return;
             }
@@ -167,7 +167,7 @@ namespace GameLogic.Combat.Hero
             _HpBl = _faBaoInfo.FabaoPowerupConfig.Power;
             cd = magicWeaponConfig.cd;
 
-            _magicWeaponControl.UseMagicWeapon(this);
+            _rootMagicWeaponControl.UseMagicWeapon(this);
         }
 
         public override void Update(float t)
@@ -182,7 +182,7 @@ namespace GameLogic.Combat.Hero
                 if (b1008 == null)
                 {
                     cd -= t;
-                    if (_magicWeaponControl.isAutoUse)
+                    if (_rootMagicWeaponControl.isAutoUse)
                     {
                         UseMagicWeapon();
                     }

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs

@@ -33,14 +33,14 @@ namespace GameLogic.Combat.Hero.State
 
             myCombatMagicWeaponEntity.GameObject.transform.eulerAngles = Vector3.zero;
             myCombatMagicWeaponEntity.GameObject.transform.localScale = Vector3.one;
-            myCombatMagicWeaponEntity.GameObject.transform.rotation = myCombatMagicWeaponEntity.MagicWeaponControl
+            myCombatMagicWeaponEntity.GameObject.transform.rotation = myCombatMagicWeaponEntity.RootMagicWeaponControl
                 .combatHeroEntity.GameObject.transform.rotation;
             myCombatMagicWeaponEntity.GameObject.SetActive(true);
-            startPos = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.dotPos;
+            startPos = myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.dotPos;
             float y = myCombatMagicWeaponEntity.IsEnemy ? 5 : 5;
             float x = xOff[myCombatMagicWeaponEntity.useIndex];
 
-            endPos = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.GameObject.transform.TransformPoint(
+            endPos = myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GameObject.transform.TransformPoint(
                 new Vector3(x, y, 0));
             // endPos = startPos +  Vector3(x-3, y, 0);
             _addTime = 1.0f / (Vector3.Distance(startPos, endPos) /
@@ -68,7 +68,7 @@ namespace GameLogic.Combat.Hero.State
                     timeLineEventLogicGroup.CloseLoopFx();
                 }
                 UseMagicWeaponEventData useMagicWeaponEventData = UseMagicWeaponEventData.Create();
-                useMagicWeaponEventData.combatHeroEntity = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity;
+                useMagicWeaponEventData.combatHeroEntity = myCombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity;
                 useMagicWeaponEventData.combatMagicWeaponEntity = myCombatMagicWeaponEntity;
                 CombatEventManager.Instance.Dispatch(CombatEventType.ShowUseMagicWeaponName, useMagicWeaponEventData);
                 // myCombatMagicWeaponEntity.GameObject.SetActive(true);

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901003.cs

@@ -25,7 +25,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
         // protected bool 
         protected override void ProMagicUseSkill()
         {
-            Own = CombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity;
+            Own = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity;
             if (pengZhuang == null)
             {
                 pengZhuang = new GameObject("pengzhaung");
@@ -36,8 +36,8 @@ namespace GameLogic.Combat.Skill.MagicSkill
             pengZhuang.SetActive(true);
             BarrierEntityMono barrierEntityMono =
                 pengZhuang.GetOrAddComponent<BarrierEntityMono>();
-            pengZhuang.transform.position = CombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.dotPos;
-            pengZhuang.transform.SetParent(CombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.GameObject
+            pengZhuang.transform.position = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.dotPos;
+            pengZhuang.transform.SetParent(CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GameObject
                 .transform);
             barrierEntityMono.Barrier = this;
             _use = true;

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901004.cs

@@ -30,32 +30,48 @@ namespace GameLogic.Combat.Skill.MagicSkill
             }
 
 
-            CombatHeroEntity combatHeroEntity = allHero[0];
-            CombatMagicWeaponEntity[] AllMagicWeapon = combatHeroEntity.MagicWeaponControl.AllMagicWeapon;
+          
+            // SkillPlayFinish();
+            target = allHero[0];
+            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(allHero[0], Finish);
+            
+            SetMagicAttShowBasic(magicAttShowBasic);
+        }
 
+        private void Finish()
+        {
+            CombatHeroEntity combatHeroEntity =target;
+            ILifetCycleHitPoint lifetCycleHitPoint = target.GetMainHotPoin<ILifetCycleHitPoint>();
+            if (lifetCycleHitPoint == null)
+            {
+                return;
+            }
+            CombatMagicWeaponEntity[] AllMagicWeapon = combatHeroEntity.heroMagicWeaponControl.AllMagicWeapon;
+
+            int maxCount = combatHeroEntity.heroMagicWeaponControl.MagicWeaponCount;
             List<CombatMagicWeaponEntity> currAllMagicWeapon = new List<CombatMagicWeaponEntity>();
             currAllMagicWeapon.AddRange(AllMagicWeapon);
             for (int i = 0; i < effectValue[0]; i++)
             {
-                if (currAllMagicWeapon.Count > 0)
+                if (maxCount > 0)
                 {
-                    int index = Random.Range(0, currAllMagicWeapon.Count);
+                    int index = Random.Range(0, maxCount);
                     BuffInfo buffInfo = BuffInfo.GetBuffInfo(10081, effectValue[1], 1);
                     CombatMagicWeaponEntity combatMagicWeaponEntity = currAllMagicWeapon[index];
-                    combatMagicWeaponEntity.BuffControl.AddBuff(CombatHeroEntity.MagicWeaponControl.combatHeroEntity,
+                    combatMagicWeaponEntity.BuffControl.AddBuff(CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity,
                         buffInfo);
                     currAllMagicWeapon.RemoveAt(index);
+                    maxCount--;
                 }
             }
-            TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic =
-                ActivationTimeLineData("sk1_xiaoshi");
+            BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
+            cBetterList.Add(lifetCycleHitPoint);
+            ActivationTimeLineData("gongji", currTarget: cBetterList);
             SkillPlayFinish();
-            // target = allHero[0];
-            // MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(allHero[0], Finish);
-            //
-            // SetMagicAttShowBasic(magicAttShowBasic);
+            // TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic =
+            //     ActivationTimeLineData("sk1_xiaoshi");
         }
-
+        
         // protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
         //     TimeLineEventLogicBasic timeLineEventLogicBasic)
         // {

Assets/Scripts/GameLogic/Combat/Skill/S501001.cs

@@ -36,7 +36,7 @@ namespace GameLogic.Combat.Skill
 
                 if (skillBasic.index - 1 == index)
                 {
-                    CombatHeroEntity.MagicWeaponControl.ReduceMagicCd(SelfSkillConfig.effectValue[0]);
+                    CombatHeroEntity.heroMagicWeaponControl.ReduceMagicCd(SelfSkillConfig.effectValue[0]);
                 }
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S89012.cs

@@ -16,6 +16,7 @@ namespace GameLogic.Combat.Skill
         public long shel;
 
         protected TimeLineEventLogicGroupBasic _timeLineEventLogicGroupBasic;
+        
         protected override void ProInitSkill()
         {
             AddTriggerCallBack("sk1_fashe", Sk1_FaSheProDefaultTimeLineTrigger);
@@ -23,6 +24,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProUseSkill()
         {
+            CombatHeroEntity.CloseLoopFx();
             _timeLineEventLogicGroupBasic=  ActivationTimeLineData("sk2");
             Own = CombatHeroEntity;
         }

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

@@ -138,8 +138,8 @@ namespace Fort23.Mono
 
         private async CTask InitMagicWeapon()
         {
-            int c = combatHeroEntity.MagicWeaponControl.MagicWeaponCount;
-            CombatMagicWeaponEntity[] combatMagicWeaponEntities = combatHeroEntity.MagicWeaponControl.AllMagicWeapon;
+            int c = combatHeroEntity.heroMagicWeaponControl.MagicWeaponCount;
+            CombatMagicWeaponEntity[] combatMagicWeaponEntities = combatHeroEntity.heroMagicWeaponControl.AllMagicWeapon;
             for (int i = 0; i < c; i++)
             {
                 CombatMagicWeaponEntity combatMagicWeaponEntity = combatMagicWeaponEntities[i];

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

@@ -106,8 +106,8 @@ namespace Fort23.Mono
         private async void AddMagicWeaponHeroEntity()
         {
             CombatMagicWeaponEntity[] magicWeaponEntities = CombatController.currActiveCombat.CombatHeroController
-                .playerHeroEntity.MagicWeaponControl.AllMagicWeapon;
-            int count = CombatController.currActiveCombat.CombatHeroController.playerHeroEntity.MagicWeaponControl
+                .playerHeroEntity.heroMagicWeaponControl.AllMagicWeapon;
+            int count = CombatController.currActiveCombat.CombatHeroController.playerHeroEntity.heroMagicWeaponControl
                 .MagicWeaponCount;
 
             for (int i = 0; i < count; i++)
@@ -153,7 +153,7 @@ namespace Fort23.Mono
             CameraSelect.onValueChanged.AddListener(CameraSelect_onValueChanged);
             AutoUse.onValueChanged.AddListener((x) =>
             {
-                CombatController.currActiveCombat.CombatHeroController.playerHeroEntity.MagicWeaponControl.isAutoUse =
+                CombatController.currActiveCombat.CombatHeroController.playerHeroEntity.heroMagicWeaponControl.isAutoUse =
                     x;
             });
         }

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

@@ -1,7 +1,9 @@
+using System.Diagnostics;
 using Common.Utility.CombatTimer;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 
 namespace Fort23.Mono
@@ -25,23 +27,43 @@ namespace Fort23.Mono
         {
         }
 
-        public void ShowUI(CombatHeroEntity heroEntity,long att , HarmType harmType, bool isHarm)
+        public void ShowUI(CombatHeroEntity heroEntity, long att, HarmType harmType, bool isHarm)
         {
-            Vector3 worldPos =heroEntity.combatHeroGameObject.hpTransform.position;
+            Vector3 worldPos = heroEntity.combatHeroGameObject.hpTransform.position;
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
             transform.position = p2;
-            if (isHarm)
+            string playName = "show";
+            if (harmType.HasFlag(HarmType.Shields))
             {
-                text.color=heroEntity.IsEnemy?Color.white:Color.red;
+                text.color = Color.cyan;
             }
-            else
+            else if (harmType.HasFlag(HarmType.Buff))
             {
-                text.color=Color.green;
+                playName = "buffshow";
+                text.color = Color.white;
             }
+            else if (harmType.HasFlag(HarmType.Recover))
+            {
+                text.color = Color.green;
+            }
+            else if (harmType.HasFlag(HarmType.Default))
+            {
+                text.color = Color.red;
+            }
+
+
+            // if (isHarm)
+            // {
+            //     text.color=heroEntity.IsEnemy?Color.white:Color.red;
+            // }
+            // else
+            // {
+            //     text.color=Color.green;
+            // }
 
             text.text = att.ToString();
-            anim.Play("show",false);
+            anim.Play(playName, false);
             // if (Animator != null)
             // {
             //     if (harmType.HasFlag(HarmType.BaoJi))
@@ -54,10 +76,7 @@ namespace Fort23.Mono
             //     }
             // }
 
-            CombatTimerManager.Instance.AddTimer(1, delegate
-            {
-                GObjectPool.Instance.Recycle(this);
-            });
+            CombatTimerManager.Instance.AddTimer(1, delegate { GObjectPool.Instance.Recycle(this); });
         }
     }
 }