修改bug

Assets/Scripts/Core/Utility/SafeTool.cs

@@ -62,5 +62,20 @@ namespace Core.Utility
 
             return keyData;
         }
+        public static string XOREncryptDecrypt(string text, string key)
+        {
+            if (string.IsNullOrEmpty(text) || string.IsNullOrEmpty(key))
+                return text;
+
+            char[] buffer = text.ToCharArray();
+            char[] keyChars = key.ToCharArray();
+
+            for (int i = 0; i < buffer.Length; i++)
+            {
+                buffer[i] ^= keyChars[i % key.Length];  // 循环使用密钥
+            }
+
+            return new string(buffer);
+        }
     }
 }

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

@@ -147,7 +147,7 @@ namespace GameLogic.Combat.CombatTool
             p1_id = Math.Min(100, Math.Max(1, p1_id));
             MitigationParaConfig mitigationParaConfig = ConfigComponent.Instance.Get<MitigationParaConfig>(p1_id);
 
-            float p1 = (def * mitigationParaConfig.mitigationPara) / 100f;
+            float p1 = (p1_id * mitigationParaConfig.mitigationPara) / 100f;
             att = GetVlaueRatioForLong(att, 100 - p1);
             harmReturnInfo.att = att;
             StartInjuredEventData startInjuredEventData = StartInjuredEventData.Create();

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

@@ -154,6 +154,11 @@ namespace GameLogic.Combat.Hero
             }
 
 
+            if (stateControl == null)
+            {
+                return;
+            }
+
             stateControl.Update(t);
             if (currFocusTarget != null && CurrState != null && CurrState.IsUpdateLockTarget() &&
                 !_combatHeroEntity.isDie && !isAlert)

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

@@ -312,6 +312,11 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
     public void HeroDie(HarmReturnInfo harmReturnInfo)
     {
+        if (isDie)
+        {
+            return;
+        }
+
         heroDieNodeId = CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount;
         isDie = true;
         HeroDieEventData heroDieEventData = HeroDieEventData.Create();

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -553,6 +553,12 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         StreamReader sr = File.OpenText(persistentDataPath);
         string data = sr.ReadToEnd();
         sr.Close();
+        int index = data.IndexOf("c_1:");
+        if (index == 0)
+        {
+            data = data.Remove(0, 4);
+            data = SafeTool.XOREncryptDecrypt(data, "xykj_ysj");
+        }
         playerData = new PlayerData();
         JsonUtility.FromJsonOverwrite(data, playerData);
 #endif

UserSettings/Layouts/default-2022.dwlt

@@ -100,7 +100,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 28
+  controlID: 190
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -220,8 +220,8 @@ MonoBehaviour:
     y: 0
     width: 631
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -245,9 +245,9 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 855
-    height: 542
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    height: 368
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -269,9 +269,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 542
+    y: 368
     width: 855
-    height: 757
+    height: 931
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
@@ -318,7 +318,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: a8adffffaefaffff1ac70000381801006a180100
+      m_ExpandedIDs: aefaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -362,8 +362,8 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1929
-    y: 73
+    x: -30071
+    y: -31970
     width: 630
     height: 1278
   m_SerializedDataModeController:
@@ -424,7 +424,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: gamer
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -434,24 +434,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res
+    - Assets/Plugins
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: gamer
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res
+  - Assets/Plugins
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 79}
-    m_SelectedIDs: b2ca0000
-    m_LastClickedID: 51890
-    m_ExpandedIDs: 0000000022a8000038ca00003aca00003cca00003eca000040ca000042ca000044ca000046ca000048ca00004aca00004cca00004eca000050ca000052ca000054ca000056ca000058ca00005aca00005cca00005eca000060ca000062ca000064ca000066ca000068ca00006aca00006cca00006eca000070ca000072ca000074ca000076ca000078ca00007aca00007cca00007eca000000ca9a3bffffff7f
+    m_SelectedIDs: fecb0000
+    m_LastClickedID: 52222
+    m_ExpandedIDs: 000000006ca9000086cb000088cb00008acb00008ccb00008ecb000090cb000092cb000094cb000096cb000098cb00009acb00009ccb00009ecb0000a0cb0000a2cb0000a4cb0000a6cb0000a8cb0000aacb0000accb0000aecb0000b0cb0000b2cb0000b4cb0000b6cb0000b8cb0000bacb0000bccb0000becb0000c0cb0000c2cb0000c4cb0000c6cb0000c8cb0000cacb0000cccb000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -479,7 +479,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000022a8000038ca00003aca00003cca00003eca000040ca000042ca000044ca000046ca000048ca00004aca00004cca00004eca000050ca000052ca000054ca000056ca000058ca00005aca00005cca00005eca000060ca000062ca000064ca000066ca000068ca00006aca00006cca00006eca000070ca000072ca000074ca000076ca000078ca00007aca00007cca00007eca0000
+    m_ExpandedIDs: 000000006ca9000086cb000088cb00008acb00008ccb00008ecb000090cb000092cb000094cb000096cb000098cb00009acb00009ccb00009ecb0000a0cb0000a2cb0000a4cb0000a6cb0000a8cb0000aacb0000accb0000aecb0000b0cb0000b2cb0000b4cb0000b6cb0000b8cb0000bacb0000bccb0000becb0000c0cb0000c2cb0000c4cb0000c6cb0000c8cb0000cacb0000cccb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -506,7 +506,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 58f70100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -556,9 +556,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 615
+    y: 441
     width: 854
-    height: 736
+    height: 910
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -602,7 +602,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
@@ -612,22 +612,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 854
-      height: 715
-    m_Scale: {x: 0.44027093, y: 0.44027093}
-    m_Translation: {x: 427, y: 357.5}
+      height: 889
+    m_Scale: {x: 0.54741377, y: 0.54741377}
+    m_Translation: {x: 427, y: 444.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -969.85736
-      y: -812
-      width: 1939.7147
-      height: 1624
+      x: -780.03156
+      y: -812.00006
+      width: 1560.0631
+      height: 1624.0001
     m_MinimalGUI: 1
-  m_defaultScale: 0.44027093
-  m_LastWindowPixelSize: {x: 854, y: 736}
+  m_defaultScale: 0.54741377
+  m_LastWindowPixelSize: {x: 854, y: 910}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -657,7 +657,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 854
-    height: 521
+    height: 347
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0