修改bug

Assets/Editor/CombatEditor/CombaReportEnditorManager.cs

@@ -37,10 +37,10 @@ public class CombaReportEnditorManager : EditorWindow
         ScrollView scrollView = new ScrollView();
         root.Add(scrollView);
         myHeroRoot = Copy<Foldout>("foldout_style");
-        root.Add(myHeroRoot);
+        scrollView.Add(myHeroRoot);
 
         enemyHeroRoot = Copy<Foldout>("foldout_style");
-        root.Add(enemyHeroRoot);
+        scrollView.Add(enemyHeroRoot);
     }
 
     public T Copy<T>(string name) where T : VisualElement, new()

Assets/Editor/CombatEditor/HeroEntityCombatReport.cs

@@ -72,12 +72,12 @@ namespace xy002Editor.CombatEditor
             foldout.Add(ScrollView);
 
 
-            Foldout foldout1 = combaReportEnditorManager.Copy<Foldout>("foldout_style2");
+            Foldout foldout1 = combaReportEnditorManager.Copy<Foldout>("foldout_style");
             foldout1.text = "英雄属性";
             foldout1.style.unityFontStyleAndWeight = FontStyle.Bold;
             foldout1.value = false;
             visualElement_h.Add(foldout1);
-            VisualElement progressVe = combaReportEnditorManager.Copy<VisualElement>("value_data_style2");
+            VisualElement progressVe = combaReportEnditorManager.Copy<VisualElement>("value_data_style");
             foldout1.Add(progressVe);
             cjShuXing = new ProgressBarShowModle(progressVe, combaReportEnditorManager);
 
@@ -160,7 +160,7 @@ namespace xy002Editor.CombatEditor
         {
             foreach (var VARIABLE in battleReportValueDataModule.fightValueData_long.Values)
             {
-                ReportFightValueData<long> reportFightValueData = VARIABLE;
+                ReportFightValueData<float> reportFightValueData = VARIABLE;
                 float max = reportFightValueData.maxValue;
                 if (maxValue > 0)
                 {

Assets/Editor/CombatEditor/ProgressBarShowModle.cs

@@ -21,8 +21,22 @@ namespace xy002Editor.CombatEditor
             if (valueReprot.TryGetValue(vname, out HeroValueReport heroValueReport))
             {
                 heroValueReport.progressBar.title = currValue.ToString();
-                heroValueReport.progressBar.lowValue = currValue;
-                heroValueReport.progressBar.highValue = maxValue;
+              
+                if (maxValue > 0)
+                {
+                    heroValueReport.progressBar.lowValue = currValue;
+                    heroValueReport.progressBar.highValue = maxValue;
+                    heroValueReport.progressBar.title = currValue + "/" + maxValue;
+                    heroValueReport.progressBar.value = currValue ;
+                  
+                }
+                else
+                {
+                    heroValueReport.progressBar.title  = currValue.ToString();
+                    heroValueReport.progressBar.lowValue = 1;
+                    heroValueReport.progressBar.highValue = 1;
+                    heroValueReport.progressBar.value = 1 ;
+                }
             }
             else
             {
@@ -35,11 +49,27 @@ namespace xy002Editor.CombatEditor
                 testv.style.color = Color.magenta;
                 herovaluegrid.Add(testv);
                 ProgressBar progressBar = manager.Copy<ProgressBar>("valuebar");
-                progressBar.title = currValue.ToString();
-                progressBar.lowValue = currValue;
-                progressBar.highValue = maxValue;
+              
+       
                 herovaluegrid.Add(progressBar);
                 heroValueReport.progressBar = progressBar;
+                
+                if (maxValue > 0)
+                {
+                    heroValueReport.progressBar.lowValue = currValue;
+                    heroValueReport.progressBar.highValue = maxValue;
+                    heroValueReport.progressBar.title = currValue + "/" + maxValue;
+                    heroValueReport.progressBar.value = currValue ;
+                  
+                }
+                else
+                {
+                    heroValueReport.progressBar.title  = currValue.ToString();
+                    heroValueReport.progressBar.lowValue = 1;
+                    heroValueReport.progressBar.highValue = 1;
+                    heroValueReport.progressBar.value = 1 ;
+                }
+                
                 valueReprot.Add(vname, heroValueReport);
             }
         }

Assets/Scripts/Core/BattleReport/BattleReportValueDataModule.cs

@@ -9,14 +9,14 @@ namespace Core.BattleReport
     {
         public string name;
 
-        public Dictionary<string, ReportFightValueData<long>> fightValueData_long =
-            new Dictionary<string, ReportFightValueData<long>>();
+        public Dictionary<string, ReportFightValueData<float>> fightValueData_long =
+            new Dictionary<string, ReportFightValueData<float>>();
 
-        public void SetMax(string name, long value)
+        public void SetMax(string name, float value)
         {
             if (!fightValueData_long.ContainsKey(name))
             {
-                fightValueData_long.Add(name, new ReportFightValueData<long>()
+                fightValueData_long.Add(name, new ReportFightValueData<float>()
                 {
                     name = name,
                     value = 0,
@@ -29,11 +29,11 @@ namespace Core.BattleReport
             }
         }
 
-        public void Add(string name, long value)
+        public void Add(string name, float value)
         {
             if (!fightValueData_long.ContainsKey(name))
             {
-                fightValueData_long.Add(name, new ReportFightValueData<long>()
+                fightValueData_long.Add(name, new ReportFightValueData<float>()
                 {
                     name = name,
                     value = value,
@@ -45,5 +45,7 @@ namespace Core.BattleReport
                 fightValueData_long[name].value = value;
             }
         }
+
+        
     }
 }

Assets/Scripts/GameLogic/Combat/CombatEvent/CombatEventType.cs

@@ -94,6 +94,10 @@
         /// 黄道改变槽位
         /// </summary>
         HuangDaoAlterSlots,
+        /// <summary>
+        /// 添加战斗信息描述
+        /// </summary>
+        AddCombatMassge,
         
     }
 }

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

@@ -143,6 +143,7 @@ namespace GameLogic.Combat.CombatTool
         public void LateUpdate(float t)
         {
             CombatHeroController.LateUpdate(t);
+            CombatReportManager.Instance.Update();
         }
 
         public async CTask<AudioSourcePool> PlayAudio(string audioName, bool isLoop)

Assets/Scripts/GameLogic/Combat/CombatTool/CombatReport/CombatReportEntityInfo.cs

@@ -51,9 +51,122 @@ namespace GameLogic.Combat.CombatTool.CombatReport
         public void Init(CombatHeroEntity combatHeroEntity)
         {
             CombatHeroEntity = combatHeroEntity;
-
+            HeroInfoModule.SetMax("计算K", CombatHeroEntity.MaxCombatHeroInfo.k);
+            HeroInfoModule.SetMax("生命", CombatHeroEntity.MaxCombatHeroInfo.hp.Value);
+            HeroInfoModule.SetMax("攻击力", CombatHeroEntity.MaxCombatHeroInfo.attack.Value);
+            HeroInfoModule.SetMax("防御", CombatHeroEntity.MaxCombatHeroInfo.defense.Value);
+            HeroInfoModule.SetMax("攻击速度", CombatHeroEntity.MaxCombatHeroInfo.attSpeed.Value);
+            HeroInfoModule.SetMax("额外攻击速度%", CombatHeroEntity.MaxCombatHeroInfo.addAttSpeed_bl);
+            HeroInfoModule.SetMax("护盾值", CombatHeroEntity.MaxCombatHeroInfo.Shield.Value);
+            HeroInfoModule.SetMax("神识", CombatHeroEntity.MaxCombatHeroInfo.shenshi.Value);
+            HeroInfoModule.SetMax("金灵根", CombatHeroEntity.MaxCombatHeroInfo.Metal);
+            HeroInfoModule.SetMax("木灵根", CombatHeroEntity.MaxCombatHeroInfo.Wood);
+            HeroInfoModule.SetMax("水灵根", CombatHeroEntity.MaxCombatHeroInfo.Water);
+            HeroInfoModule.SetMax("火灵根", CombatHeroEntity.MaxCombatHeroInfo.Fire);
+            HeroInfoModule.SetMax("土灵根", CombatHeroEntity.MaxCombatHeroInfo.Earth);
+            
+            HeroInfoModule.SetMax("金伤势", CombatHeroEntity.MaxCombatHeroInfo.Metal_Injury);
+            HeroInfoModule.SetMax("木伤势", CombatHeroEntity.MaxCombatHeroInfo.Wood_Injury);
+            HeroInfoModule.SetMax("水伤势", CombatHeroEntity.MaxCombatHeroInfo.Water_Injury);
+            HeroInfoModule.SetMax("火伤势", CombatHeroEntity.MaxCombatHeroInfo.Fire_Injury);
+            HeroInfoModule.SetMax("土伤势", CombatHeroEntity.MaxCombatHeroInfo.Earth_Injury);
+            
+            
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
             CombatEventManager.Instance.AddEventListener(CombatEventType.RecoverUpdate, RecoverUpdate);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.RemoveBuff, RemoveBuff);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, UseSkill);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseMagicWeapon, UseMagicWeapon);
+        }
+
+        public void Update()
+        {
+            UpdateHeroInfo();
+        }
+        private void UpdateHeroInfo()
+        {
+            HeroInfoModule.Add("计算K", CombatHeroEntity.CurrCombatHeroInfo.k);
+            HeroInfoModule.Add("生命", CombatHeroEntity.CurrCombatHeroInfo.hp.Value);
+            HeroInfoModule.Add("攻击力", CombatHeroEntity.CurrCombatHeroInfo.attack.Value);
+            HeroInfoModule.Add("防御", CombatHeroEntity.CurrCombatHeroInfo.defense.Value);
+            HeroInfoModule.Add("攻击速度", CombatHeroEntity.CurrCombatHeroInfo.attSpeed.Value);
+            HeroInfoModule.Add("额外攻击速度%", CombatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl);
+            HeroInfoModule.Add("护盾值", CombatHeroEntity.CurrCombatHeroInfo.Shield.Value);
+            HeroInfoModule.Add("神识", CombatHeroEntity.CurrCombatHeroInfo.shenshi.Value);
+            HeroInfoModule.Add("金灵根", CombatHeroEntity.CurrCombatHeroInfo.Metal);
+            HeroInfoModule.Add("木灵根", CombatHeroEntity.CurrCombatHeroInfo.Wood);
+            HeroInfoModule.Add("水灵根", CombatHeroEntity.CurrCombatHeroInfo.Water);
+            HeroInfoModule.Add("火灵根", CombatHeroEntity.CurrCombatHeroInfo.Fire);
+            HeroInfoModule.Add("土灵根", CombatHeroEntity.CurrCombatHeroInfo.Earth);
+            
+            HeroInfoModule.Add("金伤势", CombatHeroEntity.CurrCombatHeroInfo.Metal_Injury);
+            HeroInfoModule.Add("木伤势", CombatHeroEntity.CurrCombatHeroInfo.Wood_Injury);
+            HeroInfoModule.Add("水伤势", CombatHeroEntity.CurrCombatHeroInfo.Water_Injury);
+            HeroInfoModule.Add("火伤势", CombatHeroEntity.CurrCombatHeroInfo.Fire_Injury);
+            HeroInfoModule.Add("土伤势", CombatHeroEntity.CurrCombatHeroInfo.Earth_Injury);
+          
+        
+        }
+
+        private void UseMagicWeapon(IEventData iEventData)
+        {
+            UseMagicWeaponEventData useMagicWeaponEventData = iEventData as UseMagicWeaponEventData;
+
+            if (useMagicWeaponEventData.combatHeroEntity == CombatHeroEntity)
+            {
+                string msg =
+                    $"使用法宝  {useMagicWeaponEventData.combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.ID}";
+                float t = CombatController.currActiveCombat.combatTime;
+                MsgModule.Add(t, msg);
+            }
+        }
+        private void UseSkill(IEventData iEventData)
+        {
+            CombatUseSkillEventData combatUseSkillEventData = iEventData as CombatUseSkillEventData;
+
+            if (combatUseSkillEventData.useSkill.CombatHeroEntity == CombatHeroEntity)
+            {
+                string msg =
+                    $"使用技能  {combatUseSkillEventData.useSkill.SelfSkillConfig.ID}";
+                float t = CombatController.currActiveCombat.combatTime;
+                MsgModule.Add(t, msg);
+            }
+        }
+        private void RemoveBuff(IEventData iEventData)
+        {
+            BuffEventData buffEventData = iEventData as BuffEventData;
+
+            if (buffEventData.target == CombatHeroEntity)
+            {
+                string msg =
+                    $"移除了一个buff  {buffEventData.BuffBasic.buffInf.BuffConfig.scriptsName}" +
+                    $"  数量  {buffEventData.BuffBasic.buffInf.count}";
+                float t = CombatController.currActiveCombat.combatTime;
+                MsgModule.Add(t, msg);
+            }
+        }
+
+        private void AddBuff(IEventData iEventData)
+        {
+            BuffEventData buffEventData = iEventData as BuffEventData;
+
+            if (buffEventData.target == CombatHeroEntity)
+            {
+                string msg =
+                    $"获得buff  {buffEventData.BuffBasic.buffInf.BuffConfig.scriptsName}" +
+                    $"  数量  {buffEventData.BuffBasic.buffInf.count} 施放者{buffEventData.source.CurrCombatHeroInfo.modelID}";
+                float t = CombatController.currActiveCombat.combatTime;
+                MsgModule.Add(t, msg);
+            }
+            else if (buffEventData.source == CombatHeroEntity)
+            {
+                string msg =
+                    $"施加buff  {buffEventData.BuffBasic.buffInf.BuffConfig.scriptsName}" +
+                    $"  数量  {buffEventData.BuffBasic.buffInf.count} 目标{buffEventData.target.CurrCombatHeroInfo.modelID}";
+                float t = CombatController.currActiveCombat.combatTime;
+                MsgModule.Add(t, msg);
+            }
         }
 
         private void RecoverUpdate(IEventData iEventData)
@@ -167,6 +280,10 @@ namespace GameLogic.Combat.CombatTool.CombatReport
             CombatHeroEntity = null;
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroInjured, HeroInjured);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.RecoverUpdate, RecoverUpdate);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.RemoveBuff, RemoveBuff);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkill, UseSkill);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseMagicWeapon, UseMagicWeapon);
         }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/CombatReport/CombatReportManager.cs

@@ -48,9 +48,9 @@ namespace GameLogic.Combat.CombatTool.CombatReport
 
         public void Update()
         {
-            if (!isSaveCombat)
+            for (int i = 0; i < allCombatReportInfo.Count; i++)
             {
-                return;
+                allCombatReportInfo[i].Update();
             }
         }
     }

UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Hierarchy
   m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -43,8 +43,8 @@ MonoBehaviour:
     y: 863
     width: 932
     height: 436
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -74,7 +74,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 80
+  controlID: 43
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -152,7 +152,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 224
+  controlID: 209
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -194,8 +194,8 @@ MonoBehaviour:
     y: 0
     width: 564
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -246,8 +246,8 @@ MonoBehaviour:
     y: 0
     width: 369
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
@@ -272,8 +272,8 @@ MonoBehaviour:
     y: 0
     width: 932
     height: 863
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -362,18 +362,18 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 3eedfeffacedfeffbaedfeff78faffff
+      m_ExpandedIDs: 2671fcff2c71fcffa4ddfcffaaddfcffbc10fdffc210fdff66faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: shan02
-        m_OriginalName: shan02
+        m_Name: shan02(Clone)
+        m_OriginalName: shan02(Clone)
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -1446
+        m_UserData: -192460
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
@@ -478,7 +478,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Editor/CombatEditor
+    - Assets/Editor/UIAsset
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -486,30 +486,30 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Editor/CombatEditor
+  - Assets/Editor/UIAsset
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 56bb0200
-    m_LastClickedID: 179030
-    m_ExpandedIDs: 0000000008bd00000abd00000cbd00000ebd000010bd000012bd000016bd000018bd00001abd00001cbd00001ebd000020bd000022bd000024bd000028bd00002abd00002ebd000030bd0000acbf000058c2000000ca9a3bffffff7f
+    m_SelectedIDs: cebf0000
+    m_LastClickedID: 49102
+    m_ExpandedIDs: 0000000038bd00003abd00003cbd00003ebd000040bd000042bd000044bd000046bd000048bd00004abd00004cbd00004ebd000050bd000052bd000054bd000056bd000058bd00005abd00005cbd00005ebd0000e2bf0000fabf0000fac2000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: CombatEditor
-      m_OriginalName: CombatEditor
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 179030
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 9}
     m_SearchString: 
@@ -523,7 +523,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000008bd00000abd00000cbd00000ebd000010bd000012bd000014bd000016bd000018bd00001abd00001cbd00001ebd000020bd000022bd000024bd000026bd000028bd00002abd00002cbd00002ebd000030bd0000
+    m_ExpandedIDs: 0000000038bd00003abd00003cbd00003ebd000040bd000042bd000044bd000046bd000048bd00004abd00004cbd00004ebd000050bd000052bd000054bd000056bd000058bd00005abd00005cbd00005ebd0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -551,21 +551,21 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 66bd020000000000
+    m_ExpandedInstanceIDs: 66bd0200ee82000000000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: CombatR
+      m_OriginalName: CombatR
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 49424
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 9}
     m_CreateAssetUtility:
@@ -1072,9 +1072,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0, y: 0, z: 0}
+    m_Target: {x: -47.884098, y: 10.349055, z: 107.41173}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0}
+    m_Value: {x: -47.884098, y: 10.349055, z: 107.41173}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1124,9 +1124,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0.29061228, y: -0.15243989, z: 0.046953566, w: 0.9434522}
   m_Size:
-    m_Target: 4.1305876
+    m_Target: 58.195004
     speed: 2
-    m_Value: 4.1305876
+    m_Value: 58.195004
   m_Ortho:
     m_Target: 0
     speed: 2