修改bug

Assets/Editor/CombatEditor/CombaReportEnditorManager.cs

@@ -14,7 +14,7 @@ public class CombaReportEnditorManager : EditorWindow
     private Dictionary<string, StyleSheet> allStyleSheets = new Dictionary<string, StyleSheet>();
     public Foldout myHeroRoot;
     public Foldout enemyHeroRoot;
-
+private   Label combatTimeLabel;
     private Dictionary<CombatReportEntityInfo, HeroEntityCombatReport> allHeroReportEditors =
         new Dictionary<CombatReportEntityInfo, HeroEntityCombatReport>();
 
@@ -35,6 +35,8 @@ public class CombaReportEnditorManager : EditorWindow
             allStyleSheets.Add(UPPER.name, UPPER);
         }
 
+        combatTimeLabel = new Label("战斗时长");
+        root.Add( combatTimeLabel);
         ScrollView scrollView = new ScrollView();
         root.Add(scrollView);
         myHeroRoot = Copy<Foldout>("foldout_style");
@@ -95,8 +97,8 @@ public class CombaReportEnditorManager : EditorWindow
 
         List<CombatReportEntityInfo> allCombatReportInfo = CombatReportManager.Instance.allCombatReportInfo;
         List<CombatReportEntityInfo> remove = new List<CombatReportEntityInfo>();
-
-
+        
+        combatTimeLabel.text= "战斗时长:" + CombatReportManager.Instance.combatTime;
 
         for (int i = 0; i < allCombatReportInfo.Count; i++)
         {

Assets/Res/Config/BuffConfig.json

@@ -73,7 +73,7 @@
       "overlayCount": 15,
       "effectValue": [
         1.0,
-        0.5
+        0.3
       ],
       "timeType": 2,
       "buffTime": 15.0,

Assets/Res/Config/HeroModelConfig.json

@@ -8,10 +8,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 1,
-      "attack": 200,
-      "hp": 201,
+      "attack": 250,
+      "hp": 252,
       "def": 100,
-      "shield": 201,
+      "shield": 252,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -66,10 +66,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 198,
-      "hp": 165,
+      "attack": 248,
+      "hp": 206,
       "def": 100,
-      "shield": 165,
+      "shield": 206,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -124,10 +124,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 162,
-      "hp": 201,
+      "attack": 203,
+      "hp": 252,
       "def": 100,
-      "shield": 201,
+      "shield": 252,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -182,10 +182,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 180,
-      "hp": 181,
+      "attack": 225,
+      "hp": 227,
       "def": 100,
-      "shield": 181,
+      "shield": 227,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -240,10 +240,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 216,
-      "hp": 151,
+      "attack": 270,
+      "hp": 189,
       "def": 100,
-      "shield": 151,
+      "shield": 189,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -298,10 +298,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 144,
-      "hp": 226,
+      "attack": 180,
+      "hp": 284,
       "def": 100,
-      "shield": 226,
+      "shield": 284,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -356,10 +356,10 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 207,
-      "hp": 157,
+      "attack": 259,
+      "hp": 197,
       "def": 100,
-      "shield": 157,
+      "shield": 197,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -414,10 +414,10 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 225,
-      "hp": 145,
+      "attack": 281,
+      "hp": 182,
       "def": 100,
-      "shield": 145,
+      "shield": 182,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -472,10 +472,10 @@
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 189,
-      "hp": 172,
+      "attack": 236,
+      "hp": 216,
       "def": 100,
-      "shield": 172,
+      "shield": 216,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -530,10 +530,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 264,
-      "hp": 219,
+      "attack": 316,
+      "hp": 264,
       "def": 100,
-      "shield": 219,
+      "shield": 264,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -588,10 +588,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 216,
-      "hp": 268,
+      "attack": 259,
+      "hp": 322,
       "def": 100,
-      "shield": 268,
+      "shield": 322,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -646,10 +646,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 240,
-      "hp": 241,
+      "attack": 288,
+      "hp": 290,
       "def": 100,
-      "shield": 241,
+      "shield": 290,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -704,10 +704,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 288,
-      "hp": 201,
+      "attack": 345,
+      "hp": 242,
       "def": 100,
-      "shield": 201,
+      "shield": 242,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -762,10 +762,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 192,
-      "hp": 302,
+      "attack": 230,
+      "hp": 362,
       "def": 100,
-      "shield": 302,
+      "shield": 362,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -820,10 +820,10 @@
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 276,
-      "hp": 210,
+      "attack": 331,
+      "hp": 252,
       "def": 100,
-      "shield": 210,
+      "shield": 252,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -878,10 +878,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 300,
-      "hp": 193,
+      "attack": 359,
+      "hp": 232,
       "def": 100,
-      "shield": 193,
+      "shield": 232,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -936,10 +936,10 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 300,
-      "hp": 302,
+      "attack": 281,
+      "hp": 350,
       "def": 100,
-      "shield": 302,
+      "shield": 350,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -994,10 +994,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 300,
-      "hp": 302,
+      "attack": 125,
+      "hp": 252,
       "def": 100,
-      "shield": 302,
+      "shield": 157,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1052,10 +1052,10 @@
       "model": "Boss_BeiHaiGui",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 300,
-      "hp": 302,
-      "def": 100,
-      "shield": 302,
+      "attack": 156,
+      "hp": 283,
+      "def": 200,
+      "shield": 283,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1110,10 +1110,10 @@
       "model": "Boss_Tree",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 300,
-      "hp": 302,
+      "attack": 281,
+      "hp": 350,
       "def": 100,
-      "shield": 302,
+      "shield": 350,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1168,10 +1168,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 300,
-      "hp": 302,
+      "attack": 281,
+      "hp": 350,
       "def": 100,
-      "shield": 302,
+      "shield": 350,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1226,10 +1226,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 300,
-      "hp": 302,
+      "attack": 281,
+      "hp": 350,
       "def": 100,
-      "shield": 302,
+      "shield": 350,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Assets/Scenes/testCombat.scene

@@ -2249,7 +2249,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
-      value: 1
+      value: 125
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[1].level
@@ -2265,7 +2265,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 1
+      value: 125
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].level
@@ -2277,7 +2277,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 5003
+      value: 9004
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID
@@ -2289,11 +2289,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillLevel
-      value: 1
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillStart
-      value: 1
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[1].skillLevel
@@ -2345,11 +2345,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 0
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.size
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size

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

@@ -20,9 +20,10 @@ namespace GameLogic.Combat.Buff
         {
             combatHeroEntity.CurrCombatHeroInfo.defense += _addValue;
             _addValue = 0;
-            float b = buffCount * (BuffConfig.effectValue[0] + extraEffect);
+            float b = buffCount * (BuffConfig.effectValue[0]);
+            b += CombatCalculateTool.Instance.GetVlaueRatioForFloat(b, extraEffect);
             _addValue = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                combatHeroEntity.MaxCombatHeroInfo.defense.Value, b);
+                combatHeroEntity.MaxCombatHeroInfo.defense.Value, b );
             combatHeroEntity.CurrCombatHeroInfo.defense -= _addValue;
         }
 

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

@@ -147,7 +147,11 @@ namespace GameLogic.Combat.CombatTool
             }
 
             t *= speed;
-            combatTime += t;
+            if (!IsGameOver)
+            {
+                combatTime += t;
+            }
+
             stateControl.Update(t);
             CombatTypeBasic?.Update(t);
             MagicWeaponCombatSence?.Update(t);

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

@@ -39,7 +39,7 @@ namespace GameLogic.Combat.Skill
 
                 if (skillBasic != null&&IsPassiveActivateSkill(skillBasic))
                 {
-                    harmReturnInfo.isInvalid = true;
+                    // harmReturnInfo.isInvalid = true;
                     barrier.BarrierTriggerData.isPenetrate = true;
                 }
             }

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

@@ -37,7 +37,7 @@ namespace GameLogic.Combat.Skill
             if (heroInjuredEventData.HarmReturnInfo.source == CombatHeroEntity)
             {
                 IBarrier barrier=    heroInjuredEventData.HarmReturnInfo.triggerData.IBarrier as IBarrier;
-                if (barrier == null)
+                if (barrier != null)
                 {
                     return;
                 }

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

@@ -32,7 +32,7 @@ namespace GameLogic.Combat.Skill
             Vector3 dir = (combatHeroHitPoint.combatHeroEntity.dotPos - startPos).normalized;
             bool isLafet = false;
 
-            for (int i = 0; i < effectValue[0]*5; i++)
+            for (int i = 0; i < effectValue[0]*15; i++)
             {
                 Vector3 endPos = Vector3.zero;
                 if (i != 0)

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

@@ -10,7 +10,7 @@ namespace GameLogic.Combat.Skill
 {
     /// <summary>
     /// 玄甲护体（防御型技能）
-    /// 从四周飞来类似龟甲的碎片，乌龟龟甲上形成一个新的龟甲，防御+{0}%,敌人对其照成伤害时会收到{1}%反伤，
+    /// 从四周飞来类似龟甲的碎片，乌龟龟甲上形成一个新的龟甲，防御+{0}%,敌人对其照成伤害时会收到{1}%防御力反伤，
     /// 反伤为真实伤害。持续{2}秒
     /// </summary>
     public class S9022 : SkillBasic
@@ -36,7 +36,7 @@ namespace GameLogic.Combat.Skill
             HeroInjuredEventData heroInjuredEventData = data as HeroInjuredEventData;
             if (heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity == CombatHeroEntity)
             {
-                long harm = heroInjuredEventData.HarmReturnInfo.att;
+                long harm = CombatHeroEntity.CurrCombatHeroInfo.defense.Value;
                 long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(harm, effectValue[1]);