Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/Environment/Sky/Skybox_01.mat

@@ -79,8 +79,8 @@ Material:
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _SunDisk: 2
-    - _SunSize: 0.104
-    - _SunSizeConvergence: 3.86
+    - _SunSize: 0.024
+    - _SunSizeConvergence: 6.5
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:

Assets/Res/Config/BuffConfig.json

@@ -50,7 +50,7 @@
       "buffGroup": 1003,
       "overlayCount": 15,
       "effectValue": [
-        3.0,
+        1.5,
         15.0
       ],
       "timeType": 2,
@@ -91,7 +91,7 @@
       "buffGroup": 1005,
       "overlayCount": 15,
       "effectValue": [
-        5.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 15.0,
@@ -211,7 +211,7 @@
       "buffGroup": 1011,
       "overlayCount": 15,
       "effectValue": [
-        5.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 15.0,
@@ -313,7 +313,7 @@
       "buffGroup": 1017,
       "overlayCount": 15,
       "effectValue": [
-        5.0,
+        2.0,
         1.0
       ],
       "timeType": 2,

Assets/Res/Config/HeroModelConfig.json

@@ -936,8 +936,8 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 35,
-      "hp": 150,
+      "attack": 80,
+      "hp": 170,
       "def": 50,
       "shield": 0,
       "speed_atk": 0.0,
@@ -994,7 +994,7 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 35,
+      "attack": 65,
       "hp": 80,
       "def": 50,
       "shield": 0,

Assets/Scenes/testCombat.scene

@@ -2265,7 +2265,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 1006
+      value: 9002
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

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

@@ -66,6 +66,11 @@ namespace GameLogic.Combat.Skill
                 //发射一道闪电
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                 CombatHeroEntity combatHeroEntity = CombatHeroEntity.CombatAIBasic.currFocusTarget;
+                if (combatHeroEntity == null || combatHeroEntity.BuffControl == null)
+                {
+                    return;
+                }
+
                 b_1018 b1018 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1018>();
                 float addOdds = b1018 != null ? b1018.buffCount * effectValue[1] : 0;
                 if (_hitCount<effectValue[2]&&odds <= effectValue[0]+addOdds)

UserSettings/EditorUserSettings.asset

@@ -21,46 +21,46 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 070803025d005d095e085875407a084447161b282f7f72332b2c4832e1b46560
+      value: 0750575e51500c020b0b0a7047715a4417154f73747b73622c2d4930b4e5356b
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 0750575e51500c020b0b0a7047715a4417154f73747b73622c2d4930b4e5356b
+      value: 540250560006580f5d0d597544775944444f4e2e7e2c71367f2b4b31b4b8626d
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 540250560006580f5d0d597544775944444f4e2e7e2c71367f2b4b31b4b8626d
+      value: 5506075403000c0f585c0a2113700e44144e407d2e797e6575784f65b4b0673c
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5506075403000c0f585c0a2113700e44144e407d2e797e6575784f65b4b0673c
+      value: 515700535051580855590f2745765e44104e1c7f782d74362b784e60bbe3353e
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 515700535051580855590f2745765e44104e1c7f782d74362b784e60bbe3353e
+      value: 000600575306590e5d575d7545225d44434e1c2f2e2a72337a7a1c32e6e4663b
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 000600575306590e5d575d7545225d44434e1c2f2e2a72337a7a1c32e6e4663b
+      value: 0654575100065d5f5e0f0f2113200a444f161e737f7e25667d2c4563bab8306c
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 0654575100065d5f5e0f0f2113200a444f161e737f7e25667d2c4563bab8306c
+      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 0607575451070d595c5a542141725a44124e1b292f2923697a7b1c37bab2673e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b58f908ff0a2a4a0bfa1a5a6f6aff2feaf94e6edf38e9ccbddc18390ac86d4849395ea829f83ee8382828c84d08e8edf818b8ec1e294e0caf3f4c0eff1c6c5f5cafbc8cfcbe737ebfe7d7b
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b58f908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c928797a7cf
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8695949c9483d68a8d97d8f0ddf2c3f7f1c2f6f1c1cdf4cab68083
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8395949c9483d68a8d97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828791f5beb6fdd1cbfceba0b9f0b3bed8e8f5ade6fb8c9794919ae49499979e92ed8a809ffcca90898d80d09889d7888b8fdcf0def7c1f2f2c1f6b98b
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828791f0beb6fdd1cbfceba0b9f0b3bed8e8f5ade6fb8c978883d3f59e98909c89eacfcc
       flags: 0
     UnityEditor.ShaderGraph.ToggleSettings:
       value: 18135d1527590858060c032302276919051e1a26296a7c243f3c187fa0e92708f0e220e0e22d09352a0bed30017c5b2be01f0c47b40219221f1ded0b12eb1f0127cc0bcc18c41a5e910d0edbc85193e0dadadbf8e8f9e8ced7dba5e0b6aaaca4dbfeabfef4eae1

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -14,17 +14,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 3}
-  - {fileID: 9}
-  - {fileID: 11}
-  - {fileID: 13}
+  - {fileID: 10}
+  - {fileID: 12}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     width: 2560
     height: 1307
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+  m_MinSize: {x: 400, y: 150}
+  m_MaxSize: {x: 32384, y: 24288}
   vertical: 0
   controlID: -1
   draggingID: 0
@@ -49,9 +49,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 73
+    y: 139
     width: 1192
-    height: 851
+    height: 1022
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -105,22 +105,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 1192
-      height: 830
-    m_Scale: {x: 0.5110837, y: 0.5110837}
-    m_Translation: {x: 596, y: 415}
+      height: 1001
+    m_Scale: {x: 0.6163793, y: 0.6163793}
+    m_Translation: {x: 596, y: 500.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -1166.1494
-      y: -812.00006
-      width: 2332.2988
-      height: 1624.0001
+      x: -966.9371
+      y: -812
+      width: 1933.8741
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.5110837
-  m_LastWindowPixelSize: {x: 1192, y: 851}
+  m_defaultScale: 0.6163793
+  m_LastWindowPixelSize: {x: 1192, y: 1022}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -141,14 +141,15 @@ MonoBehaviour:
   m_Children:
   - {fileID: 4}
   - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
     width: 1193
     height: 1307
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
+  m_MinSize: {x: 100, y: 150}
+  m_MaxSize: {x: 8096, y: 24288}
   vertical: 1
   controlID: -1
   draggingID: 0
@@ -162,7 +163,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -170,15 +171,14 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1193
-    height: 872
+    height: 66
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 2}
+  m_ActualView: {fileID: 5}
   m_Panes:
   - {fileID: 5}
-  - {fileID: 2}
   - {fileID: 6}
-  m_Selected: 1
+  m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -203,7 +203,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 1192
-    height: 851
+    height: 45
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -218,8 +218,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -164, y: -26}
-      snapOffsetDelta: {x: -5, y: 0}
+      snapOffset: {x: -169, y: -26}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -232,7 +232,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 1
       snapOffset: {x: -141, y: 149}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: -130}
       snapCorner: 1
       id: unity-grid-and-snap-toolbar
       index: 1
@@ -244,9 +244,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 25}
+      snapOffset: {x: 0, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 2
       id: unity-scene-view-toolbar
       index: 0
       layout: 1
@@ -270,7 +270,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
@@ -296,7 +296,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
+      snapOffset: {x: 67.5, y: 1}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Orientation
@@ -479,7 +479,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: -3}
       snapCorner: 0
       id: Scene View/Open Tile Palette
       index: 0
@@ -492,7 +492,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: -3}
       snapCorner: 0
       id: Scene View/Tilemap Focus
       index: 1
@@ -518,7 +518,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: -3}
       snapCorner: 0
       id: Scene View/Path
       index: 9
@@ -531,7 +531,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: -3}
       snapCorner: 0
       id: APV Overlay
       index: 10
@@ -544,7 +544,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: -3}
       snapCorner: 0
       id: Scene View/TrailRenderer
       index: 11
@@ -556,7 +556,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 48}
+      snapOffset: {x: 48, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Hot Reload
@@ -588,9 +588,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.09772268, y: 20.895248, z: 25.064247}
+    m_Target: {x: -76.18256, y: 14.8125305, z: -89.82889}
     speed: 2
-    m_Value: {x: 0.09772268, y: 20.895248, z: 25.064247}
+    m_Value: {x: -76.18256, y: 14.8125305, z: -89.82889}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -636,13 +636,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.07680624, y: 0.2661532, z: -0.021395635, w: -0.96073985}
+    m_Target: {x: -0.031429797, y: -0.9658195, z: 0.21677434, w: -0.13941008}
     speed: 2
-    m_Value: {x: -0.07679796, y: 0.26612452, z: -0.021393329, w: -0.9606363}
+    m_Value: {x: -0.03142632, y: -0.96571267, z: 0.21675037, w: -0.13939466}
   m_Size:
-    m_Target: 2.6393962
+    m_Target: 23.049238
     speed: 2
-    m_Value: 2.6393962
+    m_Value: 23.049238
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -817,23 +817,49 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TimelineWindow
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 872
+    y: 66
     width: 1193
-    height: 435
-  m_MinSize: {x: 101, y: 121}
+    height: 1043
+  m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 8}
+  m_ActualView: {fileID: 2}
   m_Panes:
-  - {fileID: 8}
+  - {fileID: 2}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &8
+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: TimelineWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 1109
+    width: 1193
+    height: 198
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 9}
+  m_Panes:
+  - {fileID: 9}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -854,9 +880,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 945
+    y: 1182
     width: 1192
-    height: 414
+    height: 177
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -876,7 +902,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &9
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -897,12 +923,12 @@ MonoBehaviour:
     height: 1307
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 10}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 10}
+  - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -939,25 +965,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 24ddfbff28ddfbff2eddfbff32ddfbff3eddfbff5cdffbff56b8ffff76faffff
+      m_SelectedIDs: 7aa6ffff
+      m_LastClickedID: -22918
+      m_ExpandedIDs: ec6afafff26afaff14b4faff1ab4faff24ddfbff28ddfbff2eddfbff32ddfbff3eddfbff5cdffbff56b8ffff76faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: TestCombat
-        m_OriginalName: TestCombat
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -22918
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 9}
+        m_ClientGUIView: {fileID: 10}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -965,7 +991,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &11
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -982,16 +1008,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1493
     y: 0
-    width: 494
+    width: 493
     height: 1307
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1013,7 +1039,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1493
     y: 73
-    width: 492
+    width: 491
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1026,7 +1052,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gw_xianhe
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1036,24 +1062,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameLogic/Combat/Hero
+    - Assets/Scripts/GameLogic/CombatScenesTool
     m_Globs: []
-    m_OriginalText: ' gw_xianhe'
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameLogic/Combat/Hero
+  - Assets/Scripts/GameLogic/CombatScenesTool
   m_LastFoldersGridSize: -1
   m_LastProjectPath: D:\Server\NetServer\NetServer\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 254}
-    m_SelectedIDs: 96120300
-    m_LastClickedID: 201366
-    m_ExpandedIDs: 000000006669000040f0000042f0000044f0000046f0000048f000004af000004cf000004ef0000050f0000052f0000054f0000056f0000058f000005af0000094f00000caf00000d2f000008419010000ca9a3bffffff7f
+    m_SelectedIDs: b4120300
+    m_LastClickedID: 201396
+    m_ExpandedIDs: 000000006669000040f0000042f0000044f0000046f0000048f000004af000004cf000004ef0000050f0000052f0000054f0000056f0000058f000005af0000096f00000d2f0000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1081,7 +1107,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000006669000040f0000042f0000044f0000046f0000048f000004af000004cf000004ef0000050f0000052f0000054f0000056f0000058f000005af00000
+    m_ExpandedIDs: 000000006669000040f0000042f0000044f0000046f0000048f000004af000004cf000004ef0000050f0000052f0000054f0000056f0000058f000005af0000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1106,8 +1132,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: 7aa6ffff
+    m_LastClickedInstanceID: -22918
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 0000000040f20000a819010070f200001c990200
     m_RenameOverlay:
@@ -1125,7 +1151,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 11}
+      m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1137,7 +1163,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 114
---- !u!114 &13
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1152,18 +1178,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1987
+    x: 1986
     y: 0
-    width: 573
+    width: 574
     height: 1307
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 14}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1183,14 +1209,14 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1987
+    x: 1986
     y: 73
-    width: 572
+    width: 573
     height: 1286
   m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
+    m_DataMode: 1
+    m_PreferredDataMode: 1
+    m_SupportedDataModes: 010000000200000003000000
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas: