修改bug

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

@@ -302,8 +302,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,3 +1,4 @@
+using System.Diagnostics;
 using Common.Utility.CombatTimer;
 using Fort23.Core;
 using Fort23.UTool;
@@ -31,17 +32,34 @@ namespace Fort23.Mono
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
             transform.position = p2;
-            if (isHarm)
+            string playName = "show";
+            switch (harmType)
             {
-                text.color=heroEntity.IsEnemy?Color.white:Color.red;
-            }
-            else
-            {
-                text.color=Color.green;
+                case HarmType.Default:
+                    text.color=Color.red;
+                    break;
+                case HarmType.Shields:
+                    text.color=Color.cyan;
+                    break;
+                case HarmType.Buff:
+                    playName = "buffshow";
+                    text.color=Color.white;
+                    break;
+                case HarmType.Recover:
+                    text.color=Color.green;
+                    break;
             }
+            // 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))

UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 3276
+    y: 532
+    width: 1370
+    height: 555
+  m_ShowMode: 0
+  m_Title: Console
+  m_RootView: {fileID: 4}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -14,17 +38,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -2552
-    y: 51
-    width: 2544
-    height: 1333
+    x: 0
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
   m_Title: Hierarchy
-  m_RootView: {fileID: 2}
+  m_RootView: {fileID: 7}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 0
---- !u!114 &2
+  m_Maximized: 1
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -32,27 +56,130 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1370
+    height: 555
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 15}
+  m_Panes:
+  - {fileID: 15}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12010, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 3}
-  - {fileID: 4}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1370
+    height: 555
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 25592
+  draggingID: 0
+--- !u!114 &5
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 1143
+    width: 677
+    height: 156
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 21}
+  m_Panes:
+  - {fileID: 21}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &6
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 14}
   - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
-    height: 1333
+    width: 677
+    height: 1299
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 49
+  draggingID: 0
+--- !u!114 &7
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 8}
+  - {fileID: 9}
+  - {fileID: 10}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -69,12 +196,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &4
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,22 +214,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
   - {fileID: 6}
-  - {fileID: 7}
-  - {fileID: 8}
+  - {fileID: 11}
+  - {fileID: 12}
+  - {fileID: 13}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2544
-    height: 1283
-  m_MinSize: {x: 400, y: 50}
-  m_MaxSize: {x: 32384, y: 8096}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 100}
+  m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 78
+  controlID: 109
   draggingID: 0
---- !u!114 &5
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -118,12 +245,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1313
-    width: 2544
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &6
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -138,18 +265,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1201
+    x: 677
     y: 0
-    width: 288
-    height: 1283
+    width: 819
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 10}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 10}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -164,18 +291,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1489
+    x: 1496
     y: 0
-    width: 612
-    height: 1283
+    width: 614
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -190,18 +317,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2101
+    x: 2110
     y: 0
-    width: 443
-    height: 1283
+    width: 450
+    height: 1299
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -211,24 +338,101 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1201
-    height: 1283
+    width: 677
+    height: 1143
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 13}
-  - {fileID: 14}
-  m_Selected: 1
-  m_LastSelected: 0
---- !u!114 &10
+  - {fileID: 20}
+  - {fileID: 16}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 3276
+    y: 532
+    width: 1370
+    height: 534
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+--- !u!114 &16
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: f817a38900380be47942905e17e7d39b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 676
+    height: 439
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_Preferences:
+    editType: 0
+    timeReferenceMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_SequenceHierarchy: {fileID: 0}
+  m_SequencePath:
+    m_SelectionRoot: 0
+    m_SubElements: []
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -248,10 +452,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1351
-    y: 81
-    width: 286
-    height: 1262
+    x: 677
+    y: 73
+    width: 817
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -267,23 +471,23 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 5895f3ffd097faffe297faffd4bafaff60bbfaffbac6faffc8c6faff78faffff
+      m_ExpandedIDs: 3ef4f5ff44f4f5ff8a54f7ff82aaf9ff88aaf9ff98aaf9fff8aaf9fffeaaf9fffcfef9ff02fff9ffd01ffaff56cffbff5ccffbff26d0fbffca12fcff8668fcff8c68fcff5069fcff5669fcffc8c3fcffcec3fcff7001fdff7601fdff640afdff6c0afdff800cfdff820cfdff880cfdffea92fefff092feffba93feff92c2ffff78faffff4ab10000ecb10000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: HeroAttributeWidget (1)
-        m_OriginalName: HeroAttributeWidget (1)
+        m_Name: cj01 (1)
+        m_OriginalName: cj01 (1)
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -558950
+        m_UserData: -658370
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 4
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 6}
+        m_ClientGUIView: {fileID: 11}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -291,7 +495,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &11
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -311,10 +515,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -451
-    y: 81
-    width: 442
-    height: 1262
+    x: 2110
+    y: 73
+    width: 449
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -338,7 +542,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &12
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -358,10 +562,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1063
-    y: 81
-    width: 610
-    height: 1262
+    x: 1496
+    y: 73
+    width: 612
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -373,7 +577,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gamerun
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -381,26 +585,26 @@ MonoBehaviour:
     m_SceneHandles: 
     m_ShowAllHits: 0
     m_SkipHidden: 0
-    m_SearchArea: 0
+    m_SearchArea: 1
     m_Folders:
-    - Assets/ParticleEffectForUGUI/Scripts
+    - Assets/Art/ArtHero/FaBao
     m_Globs: []
-    m_OriginalText: gamerun
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/ParticleEffectForUGUI/Scripts
+  - Assets/Art/ArtHero/FaBao
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\FB\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: bebe0000
-    m_LastClickedID: 48830
-    m_ExpandedIDs: 0000000030bc000032bc000034bc000036bc000038bc0000c4be0000d0be0000debe000058bf000000ca9a3b
+    scrollPos: {x: 0, y: 159}
+    m_SelectedIDs: eaea0200
+    m_LastClickedID: 191210
+    m_ExpandedIDs: 000000007abc00007cbc00007ebc000080bc000082bc000084bc000086bc000088bc00008abc00008cbc00008ebc000090bc000092bc000094bc000096bc000098bc00009abc00009cbc00009ebc0000a0bc0000a2bc000002bf000048bf0000ccbf000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -416,7 +620,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 12}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -428,7 +632,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000030bc000032bc000034bc000036bc000038bc0000
+    m_ExpandedIDs: 000000007abc00007cbc00007ebc000080bc000082bc000084bc000086bc000088bc00008abc00008cbc00008ebc000090bc000092bc000094bc000096bc000098bc00009abc00009cbc00009ebc0000a0bc0000a2bc0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -472,7 +676,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 7}
+      m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -484,7 +688,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 351
---- !u!114 &13
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -504,10 +708,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -2552
-    y: 81
-    width: 1200
-    height: 1262
+    x: 0
+    y: 73
+    width: 676
+    height: 1122
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -533,7 +737,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 07000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -551,7 +755,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -560,29 +764,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1200
-      height: 1241
-    m_Scale: {x: 0.76416254, y: 0.76416254}
-    m_Translation: {x: 600, y: 620.5}
+      width: 676
+      height: 1101
+    m_Scale: {x: 0.6779557, y: 0.6779557}
+    m_Translation: {x: 338, y: 550.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -785.1733
+      x: -498.55765
       y: -812
-      width: 1570.3466
+      width: 997.1153
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.76416254
-  m_LastWindowPixelSize: {x: 1200, y: 1262}
+  m_defaultScale: 0.6779557
+  m_LastWindowPixelSize: {x: 676, y: 1122}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &14
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -602,10 +806,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -2552
-    y: 81
-    width: 1200
-    height: 1262
+    x: 0
+    y: 1216
+    width: 676
+    height: 135
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -620,7 +824,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -164, y: -26}
+      snapOffset: {x: -169, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -634,7 +838,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 1
       snapOffset: {x: -141, y: 149}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: -40}
       snapCorner: 1
       id: unity-grid-and-snap-toolbar
       index: 1
@@ -672,7 +876,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 25}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -698,7 +902,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
+      snapOffset: {x: 67.5, y: 12}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Orientation
@@ -841,7 +1045,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -953,20 +1157,33 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 10}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: UnityEditor.SceneViewCameraOverlay
+      index: 12
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
   m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.3563466, y: 1.4120404, z: 0.10534554}
+    m_Target: {x: 0.27705383, y: 17.338638, z: -19.012108}
     speed: 2
-    m_Value: {x: 0.3563466, y: 1.4120404, z: 0.10534554}
+    m_Value: {x: -22.894505, y: 6.2418456, z: 44.79017}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -994,17 +1211,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -1012,17 +1229,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: 0.2906279, y: -0.15244809, z: 0.046956092, w: 0.9435029}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: 0.29061228, y: -0.15243989, z: 0.046953566, w: 0.9434522}
   m_Size:
-    m_Target: 3.1552289
+    m_Target: 224.69795
     speed: 2
-    m_Value: 3.1552289
+    m_Value: 16.163471
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -1031,14 +1248,14 @@ MonoBehaviour:
     m_EasingEnabled: 1
     m_EasingDuration: 0.4
     m_AccelerationEnabled: 1
-    m_FieldOfViewHorizontalOrVertical: 60
+    m_FieldOfViewHorizontalOrVertical: 36
     m_NearClip: 0.03
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.001958776, y: 0.9679333, z: -0.25108573, w: 0.0075509315}
+  m_LastSceneViewRotation: {x: 0.16728084, y: -0.05290859, z: 0.008996659, w: 0.98449814}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: