修改bug

Assets/Res/Config/FabaoConfig.json

@@ -10,10 +10,12 @@
       "fragmentID": 10120,
       "Star": 1,
       "ShuxingIDs": [
-        1
+        1,
+        2
       ],
       "ShuxingPara": [
-        100
+        100,
+        10
       ],
       "SkillGroupID": 901001,
       "StarupItemCost": [

Assets/Res/Config/MitigationParaConfig.json

@@ -0,0 +1,404 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 2,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 3,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 4,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 5,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 6,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 7,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 8,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 9,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 10,
+      "mitigationPara": 150.0
+    },
+    {
+      "ID": 11,
+      "mitigationPara": 145.454544
+    },
+    {
+      "ID": 12,
+      "mitigationPara": 141.666672
+    },
+    {
+      "ID": 13,
+      "mitigationPara": 138.461533
+    },
+    {
+      "ID": 14,
+      "mitigationPara": 135.714279
+    },
+    {
+      "ID": 15,
+      "mitigationPara": 133.333328
+    },
+    {
+      "ID": 16,
+      "mitigationPara": 131.25
+    },
+    {
+      "ID": 17,
+      "mitigationPara": 129.411758
+    },
+    {
+      "ID": 18,
+      "mitigationPara": 127.777779
+    },
+    {
+      "ID": 19,
+      "mitigationPara": 126.315788
+    },
+    {
+      "ID": 20,
+      "mitigationPara": 125.0
+    },
+    {
+      "ID": 21,
+      "mitigationPara": 123.809525
+    },
+    {
+      "ID": 22,
+      "mitigationPara": 122.727272
+    },
+    {
+      "ID": 23,
+      "mitigationPara": 121.739128
+    },
+    {
+      "ID": 24,
+      "mitigationPara": 120.833336
+    },
+    {
+      "ID": 25,
+      "mitigationPara": 120.0
+    },
+    {
+      "ID": 26,
+      "mitigationPara": 119.230766
+    },
+    {
+      "ID": 27,
+      "mitigationPara": 118.518517
+    },
+    {
+      "ID": 28,
+      "mitigationPara": 117.85714
+    },
+    {
+      "ID": 29,
+      "mitigationPara": 117.241379
+    },
+    {
+      "ID": 30,
+      "mitigationPara": 116.666664
+    },
+    {
+      "ID": 31,
+      "mitigationPara": 116.129036
+    },
+    {
+      "ID": 32,
+      "mitigationPara": 115.625
+    },
+    {
+      "ID": 33,
+      "mitigationPara": 115.151512
+    },
+    {
+      "ID": 34,
+      "mitigationPara": 114.705879
+    },
+    {
+      "ID": 35,
+      "mitigationPara": 114.285713
+    },
+    {
+      "ID": 36,
+      "mitigationPara": 113.888885
+    },
+    {
+      "ID": 37,
+      "mitigationPara": 113.513512
+    },
+    {
+      "ID": 38,
+      "mitigationPara": 113.1579
+    },
+    {
+      "ID": 39,
+      "mitigationPara": 112.820511
+    },
+    {
+      "ID": 40,
+      "mitigationPara": 112.5
+    },
+    {
+      "ID": 41,
+      "mitigationPara": 111.707314
+    },
+    {
+      "ID": 42,
+      "mitigationPara": 110.952377
+    },
+    {
+      "ID": 43,
+      "mitigationPara": 110.232559
+    },
+    {
+      "ID": 44,
+      "mitigationPara": 109.545456
+    },
+    {
+      "ID": 45,
+      "mitigationPara": 108.888885
+    },
+    {
+      "ID": 46,
+      "mitigationPara": 108.260872
+    },
+    {
+      "ID": 47,
+      "mitigationPara": 107.659576
+    },
+    {
+      "ID": 48,
+      "mitigationPara": 107.083336
+    },
+    {
+      "ID": 49,
+      "mitigationPara": 106.530609
+    },
+    {
+      "ID": 50,
+      "mitigationPara": 106.0
+    },
+    {
+      "ID": 51,
+      "mitigationPara": 105.098038
+    },
+    {
+      "ID": 52,
+      "mitigationPara": 104.230766
+    },
+    {
+      "ID": 53,
+      "mitigationPara": 103.396225
+    },
+    {
+      "ID": 54,
+      "mitigationPara": 102.59259
+    },
+    {
+      "ID": 55,
+      "mitigationPara": 101.818184
+    },
+    {
+      "ID": 56,
+      "mitigationPara": 101.071426
+    },
+    {
+      "ID": 57,
+      "mitigationPara": 100.350876
+    },
+    {
+      "ID": 58,
+      "mitigationPara": 99.6551743
+    },
+    {
+      "ID": 59,
+      "mitigationPara": 98.98305
+    },
+    {
+      "ID": 60,
+      "mitigationPara": 98.3333359
+    },
+    {
+      "ID": 61,
+      "mitigationPara": 97.37705
+    },
+    {
+      "ID": 62,
+      "mitigationPara": 96.4516144
+    },
+    {
+      "ID": 63,
+      "mitigationPara": 95.55556
+    },
+    {
+      "ID": 64,
+      "mitigationPara": 94.6875
+    },
+    {
+      "ID": 65,
+      "mitigationPara": 93.84615
+    },
+    {
+      "ID": 66,
+      "mitigationPara": 93.030304
+    },
+    {
+      "ID": 67,
+      "mitigationPara": 92.23881
+    },
+    {
+      "ID": 68,
+      "mitigationPara": 91.47059
+    },
+    {
+      "ID": 69,
+      "mitigationPara": 90.72464
+    },
+    {
+      "ID": 70,
+      "mitigationPara": 90.0
+    },
+    {
+      "ID": 71,
+      "mitigationPara": 89.0140839
+    },
+    {
+      "ID": 72,
+      "mitigationPara": 88.05556
+    },
+    {
+      "ID": 73,
+      "mitigationPara": 87.12329
+    },
+    {
+      "ID": 74,
+      "mitigationPara": 86.21622
+    },
+    {
+      "ID": 75,
+      "mitigationPara": 85.3333359
+    },
+    {
+      "ID": 76,
+      "mitigationPara": 84.47369
+    },
+    {
+      "ID": 77,
+      "mitigationPara": 83.63636
+    },
+    {
+      "ID": 78,
+      "mitigationPara": 82.82051
+    },
+    {
+      "ID": 79,
+      "mitigationPara": 82.0253143
+    },
+    {
+      "ID": 80,
+      "mitigationPara": 81.25
+    },
+    {
+      "ID": 81,
+      "mitigationPara": 80.49383
+    },
+    {
+      "ID": 82,
+      "mitigationPara": 79.7560959
+    },
+    {
+      "ID": 83,
+      "mitigationPara": 79.03615
+    },
+    {
+      "ID": 84,
+      "mitigationPara": 78.3333359
+    },
+    {
+      "ID": 85,
+      "mitigationPara": 77.64706
+    },
+    {
+      "ID": 86,
+      "mitigationPara": 76.9767456
+    },
+    {
+      "ID": 87,
+      "mitigationPara": 76.32184
+    },
+    {
+      "ID": 88,
+      "mitigationPara": 75.6818161
+    },
+    {
+      "ID": 89,
+      "mitigationPara": 75.05618
+    },
+    {
+      "ID": 90,
+      "mitigationPara": 74.44444
+    },
+    {
+      "ID": 91,
+      "mitigationPara": 73.84615
+    },
+    {
+      "ID": 92,
+      "mitigationPara": 73.26087
+    },
+    {
+      "ID": 93,
+      "mitigationPara": 72.68817
+    },
+    {
+      "ID": 94,
+      "mitigationPara": 72.12766
+    },
+    {
+      "ID": 95,
+      "mitigationPara": 71.57895
+    },
+    {
+      "ID": 96,
+      "mitigationPara": 71.0416641
+    },
+    {
+      "ID": 97,
+      "mitigationPara": 70.5154648
+    },
+    {
+      "ID": 98,
+      "mitigationPara": 70.0
+    },
+    {
+      "ID": 99,
+      "mitigationPara": 69.49495
+    },
+    {
+      "ID": 100,
+      "mitigationPara": 69.0
+    }
+  ]
+}

Assets/Res/Config/MitigationParaConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3xMtyP/BninItphttrxEHhi23ChY0SALzKhObElano6siBFS6pEXPTuUN4W
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/MitigationParaConfig.cs

@@ -0,0 +1,32 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\mitigationParaConfig.xlsx. SheetName: MitigationParaConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "MitigationParaConfig.json")]
+	public partial class MitigationParaConfigHolder : ConfigHolder<MitigationParaConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct MitigationParaConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///修正百分比 100=100%
+		/// </summary>
+public float mitigationPara;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/MitigationParaConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: XXlO43v+UH54EdHtBeKF0W1NJtNWfRlqKh/qcHH5X4TNnJqucFAGeKLOChaa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -4,6 +4,7 @@ using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Common.Utility.CombatEvent;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Combat.Hero;
 using GameLogic.Player;
 using Utility;
@@ -107,16 +108,23 @@ namespace GameLogic.Combat.CombatTool
             }
 
             float wuxing = source.CurrCombatHeroInfo.GetWuXingShuXing(WuXingType);
-            int index = GeWuXingTypeIndex(WuXingType);
-            WuXingType kzWuXing = Restrain[index];
-            float direnWuXing = target.combatHeroEntity.CurrCombatHeroInfo.GetWuXingShuXing(kzWuXing);
+            // int index = GeWuXingTypeIndex(WuXingType);
+            // WuXingType kzWuXing = Restrain[index];
+            // float direnWuXing = target.combatHeroEntity.CurrCombatHeroInfo.GetWuXingShuXing(kzWuXing);
 
 
             att += GetVlaueRatioForLong(att, wuxing);
-            float def = (target.combatHeroEntity.CurrCombatHeroInfo.defense.Value * 1.0f / source.CurrCombatHeroInfo.k);
+            float def =
+                (target.combatHeroEntity.CurrCombatHeroInfo.defense.Value * 100.0f / source.CurrCombatHeroInfo.k);
 
-            float p1 = 1 - def;
 
+            int p1_id = (int)def;
+            p1_id = Math.Min(100, Math.Max(1, p1_id));
+            MitigationParaConfig mitigationParaConfig = ConfigComponent.Instance.Get<MitigationParaConfig>(p1_id);
+
+            float p1 = (def * mitigationParaConfig.mitigationPara) / 100f;
+            att = GetVlaueRatioForLong(att, 100 - p1);
+            harmReturnInfo.att = att;
             StartInjuredEventData startInjuredEventData = StartInjuredEventData.Create();
             startInjuredEventData.HarmReturnInfo = harmReturnInfo;
             CombatEventManager.Instance.Dispatch(CombatEventType.StartInjured, startInjuredEventData);

UserSettings/Layouts/default-2022.dwlt

@@ -41,10 +41,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 651
-    width: 940
+    width: 711
     height: 325
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -67,7 +67,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 976
-    width: 940
+    width: 711
     height: 323
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -96,12 +96,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 716
     y: 0
-    width: 940
+    width: 711
     height: 1299
   m_MinSize: {x: 100, y: 150}
   m_MaxSize: {x: 8096, y: 24288}
   vertical: 1
-  controlID: 54
+  controlID: 48
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -232,7 +232,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 150}
   m_MaxSize: {x: 32384, y: 24288}
   vertical: 0
-  controlID: 53
+  controlID: 47
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -270,9 +270,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1656
+    x: 1427
     y: 0
-    width: 321
+    width: 550
     height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -298,7 +298,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 940
+    width: 711
     height: 651
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -329,7 +329,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 3276
     y: 724
-    width: 938
+    width: 709
     height: 304
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -404,9 +404,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 4216
+    x: 3987
     y: 73
-    width: 319
+    width: 548
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -426,15 +426,15 @@ MonoBehaviour:
       m_ExpandedIDs: 78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Global Volume
-        m_OriginalName: Global Volume
+        m_Name: Directional Light (1)
+        m_OriginalName: Directional Light (1)
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 44126
+        m_UserData: 43768
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
@@ -516,7 +516,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 3276
     y: 1049
-    width: 938
+    width: 709
     height: 302
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -529,7 +529,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: Mit
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -539,24 +539,24 @@ MonoBehaviour:
     m_SkipHidden: 1
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameStart
+    - Assets/Scripts/GameLogic/Combat/CombatTool
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: Mit
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameStart
+  - Assets/Scripts/GameLogic/Combat/CombatTool
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 464}
-    m_SelectedIDs: 5ab90000
-    m_LastClickedID: 47450
-    m_ExpandedIDs: 0000000076b8000078b800007ab800007cb800007eb8000080b8000082b8000084b8000086b8000088b800008ab800008cb800008eb8000090b8000092b8000094b8000044b9000000ca9a3bffffff7f
+    m_SelectedIDs: 42370100
+    m_LastClickedID: 79682
+    m_ExpandedIDs: 0000000074b8000076b8000078b800007ab800007cb800007eb8000080b8000082b8000084b8000086b8000088b800008ab800008cb800008eb8000090b8000092b8000042b9000060b9000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -584,7 +584,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000076b8000078b800007ab800007cb800007eb8000080b8000082b8000084b8000086b8000088b800008ab800008cb800008eb8000090b8000092b8000094b80000
+    m_ExpandedIDs: 0000000074b8000076b8000078b800007ab800007cb800007eb8000080b8000082b8000084b8000086b8000088b800008ab800008cb800008eb8000090b8000092b80000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -611,7 +611,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: bc7400008ebd000008bd0000300b0100b0ae00005cdf0000c8480100f630010094b1000014b3000090b4000088b4000042b40000aab40000fcb3000044b30000a2b400007cb400008cb4000048a501003eb2000022b2000070de000056dc000020af00001cad00001aad000074c8000070c800000eac0000e4f90200ccd70200eaf90200f0f90200f6f902005cd10000dab300004cb20000d4b30000eab300000000000006960200beac0000acb60000b4b60000b0b600003a2401003c240100b42601002ec00000b0260100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -705,7 +705,7 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 1
+    m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
@@ -718,18 +718,18 @@ MonoBehaviour:
       y: 21
       width: 715
       height: 1257
-    m_Scale: {x: 0.88211024, y: 0.8821102}
-    m_Translation: {x: 357.5, y: 590.2344}
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 357.5, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -405.27814
-      y: -669.1164
-      width: 810.5563
-      height: 1424.9921
+      x: -461.8775
+      y: -812
+      width: 923.755
+      height: 1624
     m_MinimalGUI: 1
   m_defaultScale: 0.7740148
   m_LastWindowPixelSize: {x: 715, y: 1278}
@@ -760,7 +760,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 3276
     y: 73
-    width: 938
+    width: 709
     height: 630
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1133,9 +1133,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.61967176, y: 0.420298, z: 3.486523}
+    m_Target: {x: 6.11454, y: 7.7398353, z: 48.484695}
     speed: 2
-    m_Value: {x: 0.61967176, y: 0.420298, z: 3.486523}
+    m_Value: {x: 6.11454, y: 7.7398353, z: 48.484695}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1181,13 +1181,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.037821457, y: 0.068285055, z: -0.0011961056, w: -0.99727184}
+    m_Target: {x: -0.038943022, y: -0.10537273, z: 0.0055762446, w: -0.99398065}
     speed: 2
-    m_Value: {x: -0.037809245, y: 0.06826301, z: -0.0011957195, w: -0.9969499}
+    m_Value: {x: -0.038930397, y: -0.10533857, z: 0.005574437, w: -0.9936584}
   m_Size:
-    m_Target: 1.2641186
+    m_Target: 10.277417
     speed: 2
-    m_Value: 1.2641186
+    m_Value: 10.277417
   m_Ortho:
     m_Target: 0
     speed: 2