修改bug

Assets/Res/Aduio/Bgm.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BywXs3mqUClZK3KiHOJQ+MLbwu/go03JVGs9hiv6PUlni/EPxFPqgkdV93Gk
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Bgm/battle1.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: By4btXyqUSkCMsrpO6ny9AaXoJwwzhg4cAfbNvKZmM5dA2l9CpFQ+zJRa+Yu
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 2
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 0.31
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Bgm/battle2.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XngYtS6vUH/UPyCVbdKYq+aNQRViWuc4sZ+adiyvK5grcNwI2QRLJW/E4KTV
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 2
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Bgm/xunlongduobao.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WX9O5i/8Bnl8aTfKlkopFSIy42rnO5nMCn5caMmNCjINk3H6WmLSnaYXR5ZX
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 2
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/Bgm/yunmengze.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XXwW43n/VCgtelM/SbY7MngzrMWZYIpa8cUBTNEYW5q675S6Hlh/sIB0t3w7
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/MainAudio.asset

@@ -14,78 +14,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   useCount: 1
   configs:
-  - describe: "\u6253boss\u7684\u65F6\u5019\u7528\u7684"
-    audionClipName: bossBattle.wav
+  - describe: 
+    audionClipName: battle1.mp3
     volume: 1
-  - describe: combatBattle.wav
-    audionClipName: combatBattle.wav
+  - describe: 
+    audionClipName: battle2.mp3
     volume: 1
-  - describe: bing_hit.wav
-    audionClipName: bing_hit.wav
-    volume: 0.4
-  - describe: die1.wav
-    audionClipName: die1.wav
-    volume: 0.747
-  - describe: hero01_sk1.wav
-    audionClipName: hero01_sk1.wav
-    volume: 0.747
-  - describe: hero02_sk1.wav
-    audionClipName: hero02_sk1.wav
-    volume: 0.631
-  - describe: hero03_att.wav
-    audionClipName: hero03_att.wav
-    volume: 1
-  - describe: hero03_sk1.wav
-    audionClipName: hero03_sk1.wav
-    volume: 0.712
-  - describe: hero04_att.wav
-    audionClipName: hero04_att.wav
-    volume: 0.722
-  - describe: hero04_sk1.wav
-    audionClipName: hero04_sk1.wav
-    volume: 1
-  - describe: hero01_att.wav
-    audionClipName: hero01_att.wav
-    volume: 0.712
-  - describe: boss_lang_att.wav
-    audionClipName: boss_lang_att.wav
-    volume: 1
-  - describe: boss_lang_die.wav
-    audionClipName: boss_lang_die.wav
-    volume: 1
-  - describe: boss_lang_jiao.wav
-    audionClipName: boss_lang_jiao.wav
-    volume: 1
-  - describe: boss_lang_sk1.wav
-    audionClipName: boss_lang_sk1.wav
-    volume: 1
-  - describe: boss_lang_sk3.wav
-    audionClipName: boss_lang_sk3.wav
-    volume: 1
-  - describe: boss_she_att.wav
-    audionClipName: boss_she_att.wav
-    volume: 1
-  - describe: boss_she_die.wav
-    audionClipName: boss_she_die.wav
-    volume: 1
-  - describe: boss_she_sk1.wav
-    audionClipName: boss_she_sk1.wav
-    volume: 1
-  - describe: boss_she_sk3.wav
-    audionClipName: boss_she_sk3.wav
-    volume: 1
-  - describe: xiaoshe_die.wav
-    audionClipName: xiaoshe_die.wav
-    volume: 1
-  - describe: jingbi
-    audionClipName: jingbi.wav
-    volume: 1
-  - describe: openui
-    audionClipName: openui.wav
-    volume: 1
-  - describe: shibai
-    audionClipName: shibai.wav
-    volume: 1
-  - describe: zhuangbei
-    audionClipName: zhuangbei.wav
+  - describe: 
+    audionClipName: xunlongduobao.wav
     volume: 1

Assets/Scenes/testCombat.scene

@@ -12757,6 +12757,83 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1185765190}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2021035166
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 198328406000524784, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle03 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 198328406000524784, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3585384551010318200, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.14066
+      objectReference: {fileID: 0}
+    - target: {fileID: 3585384551010318200, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.14066
+      objectReference: {fileID: 0}
+    - target: {fileID: 3585384551010318200, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.14066
+      objectReference: {fileID: 0}
+    - target: {fileID: 7214187026765325610, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
 --- !u!1 &2068818557
 GameObject:
   m_ObjectHideFlags: 0
@@ -14648,3 +14725,4 @@ SceneRoots:
   - {fileID: 9136575265582076979}
   - {fileID: 1482512349}
   - {fileID: 143773478}
+  - {fileID: 2021035166}

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

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

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Dn1Jsi6vUC03GvgnjXoAPrZo4p7qkwWDr+YKd+/rS3XHA/aqnCcymD+o0jcb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/Combat/CombatState/CombatFightState.cs

@@ -1,3 +1,4 @@
+using Core.Audio;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.CombatTool.CombatReport;
 using GameLogic.Combat.Hero;
@@ -17,14 +18,13 @@ namespace GameLogic.Combat.CombatState
             CombatController.CombatCameraControllder.SetPos(playerHeroEntity.combatHeroGameObject.transform);
             CombatController.CombatCameraControllder.isStop = true;
             CombatController.IsFightState = true;
-            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(60,3);
-            
+            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(60, 3);
+            AudioManager.Instance.PlayBGM("battle1.mp3");
         }
 
         protected override void ProExit()
         {
             CombatController.CombatCameraControllder.isStop = false;
-           
         }
 
         protected override void ProUpdate(float t)
@@ -36,14 +36,27 @@ namespace GameLogic.Combat.CombatState
             }
 
             CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
-            IHero ihero = FindMinDixtance(allHero,maxCount);
+                CombatController.currActiveCombat.CombatHeroController.GetHero(true, out int maxCount);
+            IHero ihero = FindMinDixtance(allHero, maxCount, 500);
             if (ihero == null)
             {
                 CombatController.ChangeState("update");
                 return;
             }
 
+            IHero ihero2 = FindMinDixtance(allHero, maxCount, 225);
+            if (ihero2 == null)
+            {
+                float add = 0.1f;
+                Vector3 pos = playerHeroEntity.dotPos;
+                Vector3 dir = CombatController.currActiveCombat.CombatHeroController.moveDir;
+                float fx = 1;
+
+                pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;
+
+                playerHeroEntity.combatHeroGameObject.SetPosition(pos);
+                playerHeroEntity.GameObject.transform.rotation = Quaternion.LookRotation(dir * fx);
+            }
 
 
             CombatController.CombatHeroController.Update(t);
@@ -51,7 +64,7 @@ namespace GameLogic.Combat.CombatState
             CombatController.GameTimeLineParticleFactory.CombatUpdate(t);
         }
 
-        protected IHero FindMinDixtance(CombatHeroEntity[] allHero,int maxCount)
+        protected IHero FindMinDixtance(CombatHeroEntity[] allHero, int maxCount, int maxDis)
         {
             IHero minDistanceHero = null;
             if (allHero == null)
@@ -71,7 +84,7 @@ namespace GameLogic.Combat.CombatState
 
                 float distance = Vector3.SqrMagnitude(hero.combatHeroGameObject.position -
                                                       playerHeroEntity.combatHeroGameObject.position);
-                if (distance < minDistance&& distance < 500)
+                if (distance < minDistance && distance < maxDis)
                 {
                     // if (!_combatHeroEntity.IsEnemy || distance < _combatHeroEntity.CurrCombatHeroInfo.maxDisTo + 100)
                     {

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -1,4 +1,5 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using Core.Audio;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.CombatType;
@@ -35,7 +36,7 @@ namespace GameLogic.Combat.CombatState
                 playerHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Flight,isQiangZhi:true);
                 playerHeroEntity.CurrCombatHeroInfo.Shield = playerHeroEntity.MaxCombatHeroInfo.Shield;
                 CombatCalculateTool.Instance.Recover(playerHeroEntity,
-                    playerHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), 999999, AttType.Normal, HarmType.Default,
+                    playerHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), 999999, AttType.Normal, HarmType.Null,
                     new TriggerData());
             }
 
@@ -43,6 +44,7 @@ namespace GameLogic.Combat.CombatState
             isNullMonster = true;
             CombatController.MagicWeaponCombatSence.CloseSecene();
             CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(70,1);
+            AudioManager.Instance.PlayBGM("xunlongduobao.wav");
         }
 
         protected override void ProUpdate(float t)
@@ -68,22 +70,18 @@ namespace GameLogic.Combat.CombatState
 
             CombatHeroEntity[] allHero =
                 CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
-            IHero ihero = FindMinDixtance(allHero,maxCount);
-            if (ihero != null)
+            if (maxCount > 0)
             {
                 CombatController.ChangeState("fight");
                 return;
             }
+            
 
             float add = 0.1f;
             Vector3 pos = playerHeroEntity.dotPos;
             Vector3 dir =  CombatController.currActiveCombat.CombatHeroController.moveDir;
             float fx = 1;
-
-            // pos = CombatController.currActiveCombat.CombatSenceController.Move(10 * t);
-            // float lt = CombatController.currActiveCombat.CombatSenceController.currTime - 0.01f;
-            // Vector3 p = CombatController.currActiveCombat.CombatSenceController.GetTarget(lt);
-            // dir = (pos - p).normalized;
+            
             pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;
 
             playerHeroEntity.combatHeroGameObject.SetPosition(pos);

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

@@ -5,27 +5,27 @@ namespace GameLogic.Combat.CombatTool
     [Flags]
     public enum HarmType
     {
-        Null=0,
-        Default=1,
+        Null=1,
+        Default=2,
         /// <summary>
         /// 系统杀死 不掉落和统计
         /// </summary>
-        SystemKo=2,
+        SystemKo=4,
         /// <summary>
         /// 暴击了
         /// </summary>
-        BaoJi=4,
+        BaoJi=8,
         /// <summary>
         /// 护盾 性伤害
         /// </summary>
-        Shields=8,
+        Shields=16,
         /// <summary>
         /// buff性伤害
         /// </summary>
-        Buff=16,
+        Buff=32,
         /// <summary>
         /// 恢复
         /// </summary>
-        Recover=32,
+        Recover=64,
     }
 }

Assets/Scripts/GameUI/UI/CombatPanel/CombatShowTextPanel.cs

@@ -57,6 +57,11 @@ namespace Fort23.Mono
             CombatHeroEntity heroEntity = harmReturnInfo.target.combatHeroEntity as CombatHeroEntity;
             long att = harmReturnInfo.att;
             HarmType harmType = harmReturnInfo.harmType;
+            if (harmType.HasFlag(HarmType.Null))
+            {
+                return;
+            }
+
             ShowTextWidget widget =
                 await UIManager.Instance.CreateGComponentForObject<ShowTextWidget>(ShowTextWidget, null, transform,
                     isInstance: true);

UserSettings/Layouts/default-2022.dwlt

@@ -1,30 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
-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: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 1289.0001
-    y: 529.50006
-    width: 976.5001
-    height: 709.00006
-  m_ShowMode: 0
-  m_Title: "\u65F6\u95F4\u8F74"
-  m_RootView: {fileID: 4}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -39,67 +15,16 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 32.000004
-    width: 1920.0002
-    height: 1012.0001
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: "\u68C0\u67E5\u5668"
-  m_RootView: {fileID: 6}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 3}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &3
-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: 0
-    width: 976.5001
-    height: 709.00006
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 14}
-  m_Panes:
-  - {fileID: 14}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &4
-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: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 3}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 976.5001
-    height: 709.00006
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 2276
-  draggingID: 0
---- !u!114 &5
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -114,18 +39,19 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 411.00003
+    x: 879
     y: 0
-    width: 416.00003
-    height: 962.00006
+    width: 742
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 19}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 16}
+  - {fileID: 11}
   m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &6
+  m_LastSelected: 1
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -138,22 +64,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 7}
-  - {fileID: 8}
-  - {fileID: 9}
+  - {fileID: 4}
+  - {fileID: 5}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
-    height: 1012.00006
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &7
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -170,12 +96,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &8
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -188,23 +114,23 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 13}
-  - {fileID: 5}
   - {fileID: 10}
-  - {fileID: 11}
-  - {fileID: 12}
+  - {fileID: 2}
+  - {fileID: 7}
+  - {fileID: 8}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0001
-    height: 962.00006
+    width: 2560
+    height: 1299
   m_MinSize: {x: 500, y: 50}
   m_MaxSize: {x: 40480, y: 8096}
   vertical: 0
-  controlID: 41
+  controlID: 273
   draggingID: 0
---- !u!114 &9
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -220,12 +146,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.00006
-    width: 1920.0001
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &10
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -240,18 +166,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 827.00006
+    x: 1621
     y: 0
-    width: 388.00006
-    height: 962.00006
+    width: 220
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -266,18 +192,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1215.0001
+    x: 1841
     y: 0
-    width: 402.5
-    height: 962.00006
+    width: 316
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -292,18 +218,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1617.5001
+    x: 2157
     y: 0
-    width: 302.5
-    height: 962.00006
+    width: 403
+    height: 1299
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -320,16 +246,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 411.00003
-    height: 962.00006
+    width: 879
+    height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -344,15 +270,15 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u65F6\u95F4\u8F74"
-    m_Image: {fileID: -5401195905404635996, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1289.0001
-    y: 529.50006
-    width: 976.5001
-    height: 688.00006
+    x: 361
+    y: 73
+    width: 740
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -372,7 +298,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &15
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -387,15 +313,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u5C42\u7EA7"
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 827.0001
-    y: 62.000008
-    width: 386.00006
-    height: 941.00006
+    x: 1621
+    y: 73
+    width: 218
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -408,26 +334,26 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_SceneHierarchy:
     m_TreeViewState:
-      scrollPos: {x: 0, y: 120}
+      scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: f8d2ffffb0d5ffffd0d5ffff3ef4ffff42f4ffff7efaffff38cd0000f8db0000fedc000042de0000c0de0000a4e30000
+      m_ExpandedIDs: 4ac7ffff50c7ffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: fb_3203
-        m_OriginalName: fb_3203
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 55862
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 10}
+        m_ClientGUIView: {fileID: 7}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -435,7 +361,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &16
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -450,15 +376,15 @@ MonoBehaviour:
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u68C0\u67E5\u5668"
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1617.5002
-    y: 62.000008
-    width: 301.5
-    height: 941.00006
+    x: 2157
+    y: 73
+    width: 402
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -482,7 +408,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &17
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -497,15 +423,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: "\u9879\u76EE"
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1215.0001
-    y: 62.000008
-    width: 400.5
-    height: 941.00006
+    x: 1841
+    y: 73
+    width: 314
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -527,7 +453,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/ArtHero/FaBao
+    - Assets/Editor
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -535,16 +461,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/ArtHero/FaBao
+  - Assets/Editor
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: E:\XY002\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 55}
-    m_SelectedIDs: 32af0100
-    m_LastClickedID: 110386
-    m_ExpandedIDs: 000000009a8701009c8701009e870100a0870100a2870100a4870100a6870100a8870100aa870100ac870100ae870100b0870100b2870100b4870100b6870100b8870100ba870100bc870100be870100c0870100c2870100c4870100c6870100c8870100ca870100cc870100ce870100d0870100d2870100d4870100d6870100d8870100da870100dc870100de870100628801005a8a0100888a01009a8a010000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: b4fb0000
+    m_LastClickedID: 64436
+    m_ExpandedIDs: 0000000022fb000024fb000026fb000028fb00002afb00002cfb00002efb000030fb000032fb000034fb000036fb000038fb00003afb00003cfb00003efb000040fb000042fb000044fb000046fb000048fb00004afb00004cfb00004efb000050fb000052fb000054fb000056fb000058fb00005afb00005cfb00005efb000060fb000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -572,7 +498,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000009a8701009c8701009e870100a0870100a2870100a4870100a6870100a8870100aa870100ac870100ae870100b0870100b2870100b4870100b6870100b8870100ba870100bc870100be870100c0870100c2870100c4870100c6870100c8870100ca870100cc870100ce870100d0870100d2870100d4870100d6870100d8870100da870100dc870100de870100
+    m_ExpandedIDs: 0000000022fb000024fb000026fb000028fb00002afb00002cfb00002efb000030fb000032fb000034fb000036fb000038fb00003afb00003cfb00003efb000040fb000042fb000044fb000046fb000048fb00004afb00004cfb00004efb000050fb000052fb000054fb000056fb000058fb00005afb00005cfb00005efb000060fb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -616,7 +542,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 11}
+      m_ClientGUIView: {fileID: 8}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -628,7 +554,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 198
---- !u!114 &18
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -643,15 +569,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u6E38\u620F"
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 62.000008
-    width: 410.00003
-    height: 941.00006
+    y: 73
+    width: 878
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -683,17 +609,17 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.50002
-    m_HBaseRangeMax: 187.50002
-    m_VBaseRangeMin: -406.00006
-    m_VBaseRangeMax: 406.00006
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 0
+    m_VSlider: 1
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
@@ -704,29 +630,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 410.00003
-      height: 920.00006
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 205.00002, y: 460.00003}
+      width: 878
+      height: 1257
+    m_Scale: {x: 0.7972352, y: 0.7972352}
+    m_Translation: {x: 439, y: 627.705}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -205.00002
-      y: -460.00003
-      width: 410.00003
-      height: 920.00006
+      x: -550.6531
+      y: -787.35236
+      width: 1101.3062
+      height: 1576.6991
     m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 820, y: 1882}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 878, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &19
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -741,15 +667,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u573A\u666F"
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 411.00006
-    y: 62.000008
-    width: 414.00003
-    height: 941.00006
+    x: 879
+    y: 73
+    width: 740
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1102,9 +1028,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 48}
+      snapOffset: {x: -200, y: -55}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 3
       id: Hot Reload
       index: 12
       layout: 4
@@ -1121,9 +1047,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.600259, y: 20.565851, z: 14.998222}
+    m_Target: {x: -127.35085, y: -32.111565, z: -348.24484}
     speed: 2
-    m_Value: {x: 0.600259, y: 20.565851, z: 14.998222}
+    m_Value: {x: -127.35085, y: -32.111565, z: -348.24484}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1132,7 +1058,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -1169,13 +1095,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.31362367, y: -0.012097946, z: 0.0046439474, w: 0.9494464}
+    m_Target: {x: -0.0046656313, y: -0.9712362, z: 0.23800933, w: -0.021514397}
     speed: 2
-    m_Value: {x: 0.31362382, y: -0.01281018, z: 0.004879222, w: 0.94944835}
+    m_Value: {x: -0.0046646222, y: -0.9710261, z: 0.23795785, w: -0.021509742}
   m_Size:
-    m_Target: 4.8994513
+    m_Target: 439.56247
     speed: 2
-    m_Value: 4.895522
+    m_Value: 460.27484
   m_Ortho:
     m_Target: 0
     speed: 2