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

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.21190071
+    - _Alpha: 0.2207349
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.19786286
+    - _MainTexOffsetU: 0.1874206
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/SkillConfig.json

@@ -4712,7 +4712,7 @@
       "level": 1,
       "effectUpK": 20,
       "effectValue": [
-        20.0
+        10.0
       ],
       "intensifierIndex": [
         1
@@ -4740,7 +4740,7 @@
       "level": 2,
       "effectUpK": 20,
       "effectValue": [
-        25.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -4777,7 +4777,7 @@
       "level": 3,
       "effectUpK": 20,
       "effectValue": [
-        30.0
+        14.0
       ],
       "intensifierIndex": [
         1
@@ -4814,7 +4814,7 @@
       "level": 4,
       "effectUpK": 20,
       "effectValue": [
-        35.0
+        16.0
       ],
       "intensifierIndex": [
         1
@@ -4851,7 +4851,7 @@
       "level": 5,
       "effectUpK": 20,
       "effectValue": [
-        40.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -4888,7 +4888,7 @@
       "level": 6,
       "effectUpK": 20,
       "effectValue": [
-        45.0
+        20.0
       ],
       "intensifierIndex": [
         1
@@ -5544,7 +5544,7 @@
       "level": 1,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        6.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5573,7 +5573,7 @@
       "level": 2,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        7.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5611,7 +5611,7 @@
       "level": 3,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        8.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5649,7 +5649,7 @@
       "level": 4,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        9.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5725,7 +5725,7 @@
       "level": 6,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        11.0,
         9.0,
         15.0
       ],
@@ -5759,10 +5759,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
-        100.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -5788,7 +5788,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
         100.0
@@ -5826,10 +5826,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
-        100.0
+        120.0
       ],
       "intensifierIndex": [
         2
@@ -5864,10 +5864,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
-        100.0
+        140.0
       ],
       "intensifierIndex": [
         2
@@ -5902,10 +5902,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
-        100.0
+        160.0
       ],
       "intensifierIndex": [
         2
@@ -5940,10 +5940,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         2.0,
-        100.0,
+        180.0,
         1.0
       ],
       "intensifierIndex": [
@@ -6390,7 +6390,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         550.0
       ],
@@ -6414,7 +6414,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         650.0
       ],
@@ -6447,7 +6447,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         750.0
       ],
@@ -6480,7 +6480,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         850.0
       ],
@@ -6513,7 +6513,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         950.0
       ],
@@ -6546,7 +6546,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         1050.0
       ],
@@ -6948,7 +6948,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         20.0,
@@ -6978,7 +6978,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         30.0,
@@ -7017,7 +7017,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         4.0,
         40.0,
@@ -7056,7 +7056,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         4.0,
         50.0,
@@ -7095,7 +7095,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         4.0,
         60.0,
@@ -7134,7 +7134,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         3.0,
         70.0,

Assets/Scripts/Core/BRG/BRG_backgrond.cs

@@ -42,7 +42,7 @@ public class BRG_backgrond : MonoBehaviour
                 BGRGameObjectInfo info = new BGRGameObjectInfo();
                 info.pos = new Vector3(i * 2, j , 0); // 增加间距，使物体更容易看到
                 info.rot = Vector3.zero;
-                info.scale = Vector3.one; // 调整尺寸
+                info.scale = Vector3.one; 
                 m_gameObjectInfos.Add(info);
             }
         }

Assets/Scripts/Core/BRG/BatchShaderBind.cs

@@ -17,6 +17,8 @@ namespace Core.BRG
         private int _count;
         private int _size;
 
+        public int updateMinIndex;
+        public int updateMaxIndex;
         public void InitBuffer(int count)
         {
             this._count = count;

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/CombatState/CombatFightState.cs

@@ -30,6 +30,7 @@ namespace GameLogic.Combat.CombatState
             }
 
             CombatController.currActiveCombat.CombatCameraControllder.EnterCombat();
+            CombatController.currActiveCombat.isPrepare = true;
         }
 
         protected override void ProExit()
@@ -50,6 +51,25 @@ namespace GameLogic.Combat.CombatState
 
             CombatHeroEntity[] allHero =
                 CombatController.currActiveCombat.CombatHeroController.GetHero(true, out int maxCount);
+            if (CombatController.currActiveCombat.isPrepare)
+            {
+                bool isPrepareFinish = true;
+                for (int i = 0; i < allHero.Length; i++)
+                {
+                    if (allHero[i].CombatAIBasic.stateControl.CurrStateName.Equals(CombatHeroStateType.Active))
+                    {
+                        isPrepareFinish = false;
+                        break;
+                    }
+                }
+
+                if (isPrepareFinish)
+                {
+                    CombatController.currActiveCombat.isPrepare = false;
+                    //准备完成
+                }
+            }
+
             IHero ihero = FindMinDixtance(allHero, maxCount, 500);
             if (ihero == null)
             {

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

@@ -55,6 +55,7 @@ namespace GameLogic.Combat.CombatTool
 
         public bool IsGameOver;
         public bool IsFightState;
+        public bool isPrepare;
 
         public System.Action<bool> combatFinish;
         public float combatTime;

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

@@ -94,6 +94,11 @@ namespace GameLogic.Combat.Hero
 
         public void Update(float t)
         {
+            if (CombatController.currActiveCombat.isPrepare)
+            {
+                return;
+            }
+
             for (int i = 0; i < allSkill.Count; i++)
             {
                 allSkill[i].CombatUpdate(t);

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroActiveState.cs

@@ -1,39 +1,69 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using Fort23.UTool;
+using UnityEngine;
 
 namespace GameLogic.Combat.Hero.State
 {
     public class CombatHeroActiveState : CombatHeroStateBasic
     {
+        private Vector3 stratPos;
+        private Vector3 endpos;
+        private float currTime;
+        private ParticleSystemPool loopFx;
+
         public CombatHeroActiveState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
         }
+
         public override bool IsUpdateLockTarget()
         {
             return false;
         }
+
         protected override void ProEnter()
         {
-            combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            // TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-            //     combatHeroEntity.combatHeroTimeLineControl.TimeLineData
-            //         .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("jihuo", null);
-            // if (timeLineEventLogicGroup != null)
-            // {
-            //     timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
-            //     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate
-            //     {
-            //         // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            //         combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-            //         combatHeroEntity.CombatAIBasic.isAlert = false;
-            //     };
-            //     combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
-            // }
-            // else
-            // {
-            //     // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            //     combatHeroEntity.CombatAIBasic.isAlert = false;
-            //     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-            // }
+            stratPos = combatHeroEntity.dotPos;
+            currTime = 0;
+            // endpos
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_loop.prefab",
+                delegate(ParticleSystemPool obj)
+                {
+                    loopFx = obj;
+                    obj.own.transform.position = stratPos;
+                });
+            // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
+            // // TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
+            // //     combatHeroEntity.combatHeroTimeLineControl.TimeLineData
+            // //         .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("jihuo", null);
+            // // if (timeLineEventLogicGroup != null)
+            // // {
+            // //     timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
+            // //     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate
+            // //     {
+            // //         // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
+            // //         combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            // //         combatHeroEntity.CombatAIBasic.isAlert = false;
+            // //     };
+            // //     combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
+            // // }
+            // // else
+            // // {
+            // //     // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
+            // //     combatHeroEntity.CombatAIBasic.isAlert = false;
+            // //     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            // // }
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            currTime += t;
+            if (currTime > 2)
+            {
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_show.prefab",
+                    delegate(ParticleSystemPool obj) { obj.own.transform.position = stratPos; });
+                GObjectPool.Instance.Recycle(loopFx);
+                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            }
         }
     }
 }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -58,7 +58,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
-  
 
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         EventManager.Instance.AddEventListener(CustomEventType.DetectRandomEvent, RenfenceRandomEvent);
@@ -278,7 +277,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     // }
 
 
-    public bool IsEventTrigger(int eventID)
+    public bool IsEventCompleted(int eventID)
     {
         foreach (var eventList in AccountFileInfo.Instance.playerData.completeEvents)
         {
@@ -288,6 +287,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
+        foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+        {
+            if (eventList.eventID == eventID && eventList.isCompleted)
+            {
+                return true;
+            }
+        }
+
         return false;
     }
 
@@ -344,7 +351,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         {
             //刷新支线任务
             List<EventConfig> zhiXianEvents = eventConfigs.Where(e =>
-                e.EventTriggerType == 6 && !BagIsEvent(e.ID) && !IsEventTrigger(e.ID) &&
+                e.EventTriggerType == 6 && !BagIsEvent(e.ID) && !IsEventCompleted(e.ID) &&
                 ((e.SmallPlacesId == 0 && e.placeID == 0) ||
                  (e.SmallPlacesId != 0 && e.SmallPlacesId == smallPlacesConfig.ID) ||
                  (e.SmallPlacesId == 0 && e.placeID == smallPlacesConfig.PlacesId)) &&
@@ -792,7 +799,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
         {
             CancelEvent(CurrentEventList);
             cTask.SetResult();
-            
         });
         uiOpenOverCallBack?.Invoke();
 
@@ -900,13 +906,15 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     CeekTaskComplete(eventConditionData, type, value);
                 }
             }
-            if (playerDataEventLinkData.eventID == 10001 && playerDataEventLinkData.curStep == 1000104 &&
-                IsCeekEventGroupComplete(playerDataEventLinkData.eventLinks[3].eventConditions))
-            {
-                TriggerEvent(playerDataEventLinkData);
-            }
+
+            // if (playerDataEventLinkData.eventID == 10001 && playerDataEventLinkData.curStep == 1000104 &&
+            //     IsCeekEventGroupComplete(playerDataEventLinkData.eventLinks[3].eventConditions))
+            // {
+            //     isTriggerEvent = false;
+            //     TriggerEvent(playerDataEventLinkData);
+            // }
         }
-        
+
         EventManager.Instance.Dispatch(CustomEventType.RemoveEvent, null);
     }
 
@@ -991,6 +999,20 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     }
                 }
 
+                break;
+
+            //完成某个事件
+            case 10:
+                if (eventConditionConfig.ConditionType == 10 &&
+                    EventSystemManager.Instance.IsEventCompleted(eventConditionConfig.ConditionPara[0]))
+                {
+                    conditionData.fishCount++;
+
+                    if (IsEvenkLinkComplete(conditionData))
+                    {
+                    }
+                }
+
                 break;
         }
 
@@ -1202,6 +1224,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
             eventList.isCompleted = true;
         }
 
+        CeekEventCompletes(10, null);
+
         if (itemInfos != null && itemInfos.Count > 0)
         {
             RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -103,8 +103,6 @@ namespace Fort23.Mono
 
         public async void Bnt_ShengShi_Click()
         {
-      
-
             await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); });
         }
 
@@ -237,6 +235,17 @@ namespace Fort23.Mono
                 await DivineSenceEventPreviewPanel.OpenPanel();
             }
 
+            foreach (var playerDataEventLinkData in AccountFileInfo.Instance.playerData.eventList)
+            {
+                if (playerDataEventLinkData.eventID == 10001 && playerDataEventLinkData.curStep == 1000104 &&
+                    EventSystemManager.Instance.IsCeekEventGroupComplete(playerDataEventLinkData.eventLinks[3]
+                        .eventConditions))
+                {
+                    EventSystemManager.Instance.TriggerEvent(playerDataEventLinkData);
+                    break;
+                }
+            }
+
             // if (PlayerGuideManager.Instance.GuideIsCanDo(1, 2))
             // {
             //     PlayerGuideManager.Instance.NextGuide();

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -91,7 +91,7 @@ namespace Fort23.Mono
                 if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
                     && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
                     && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
-                    && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
+                    && !EventSystemManager.Instance.IsEventCompleted(_daoyouModelConfig.QuestID))
                 {
                     AccountFileInfo.EventList eventList =
                         EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
@@ -252,7 +252,7 @@ namespace Fort23.Mono
 
             if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
                 && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
-                && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
+                && !EventSystemManager.Instance.IsEventCompleted(_daoyouModelConfig.QuestID))
             {
                 Btn_Eveent.gameObject.SetActive(true);
             }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -79,7 +79,7 @@ namespace Fort23.Mono
                 if (_daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
                     && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
                     && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
-                    && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
+                    && !EventSystemManager.Instance.IsEventCompleted(_daoyouModelConfig.QuestID))
                 {
                     Btn_Event.gameObject.SetActive(true);
                 }

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase7.cs

@@ -206,22 +206,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep706(UnityEngine.Object obj)
         {
             pgm.StepInit();
-            // await TimerComponent.Instance.WaitAsync(100);
-
-            // GameObject gameObject =
-            //     UIManager.Instance.GetComponent<ShopBuyItemPanel>().Btn_Function.gameObject;
-            // Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
-            // Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
-
-            // pgm.SetfxTransVisiable(true);
-            // pgm.SetMaskTarget(gameObject);
-            // pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
             await pgm.ConfigLogic(706, delegate() { pgm.NextGuide(); });
-
-            // pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
-            // pgm.SetFingerVisiable(true);
-
-            UIManager.Instance.HideUIUIPanel<ShopPanel>();
         }
 
         public async CTask OnStepEnd(UnityEngine.Object obj)

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -8,6 +8,7 @@ using Fort23.UTool;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace Fort23.Mono
 {
@@ -82,20 +83,19 @@ namespace Fort23.Mono
         }
 
 
-        public override CTask Show()
+        public async override CTask Show()
         {
+            base.Show();
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Content);
             if (currentNeedPlacesInfoWidget != null)
             {
                 Vector3 localPos = transform.InverseTransformPoint(currentNeedPlacesInfoWidget.transform.position);
-                Vector2 size = currentNeedPlacesInfoWidget.transform.sizeDelta;
 
-                GuideHand.transform.localPosition = PlayerGuideManager.Instance.GetProperPos(localPos, size,
-                    currentNeedPlacesInfoWidget.GObjectPoolInterface);
+
+                GuideHand.transform.localPosition = localPos;
             }
 
             GuideHand.gameObject.SetActive(currentNeedPlacesInfoWidget != null);
-
-            return base.Show();
         }
 
         public static async CTask OpenPanel(int placesId, Action<bool> callBack, int needSmallPlacesId = 0)

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -82,7 +82,7 @@ namespace Fort23.Mono
                     await PlayerGuideManager.Instance.SetGuid(4);
                 }
 
-                if (EventSystemManager.Instance.IsEventTrigger(10003) && PlayerGuideManager.Instance.GuideIsCanDo(6))
+                if (EventSystemManager.Instance.IsEventCompleted(10003) && PlayerGuideManager.Instance.GuideIsCanDo(6))
                 {
                     await PlayerGuideManager.Instance.SetGuid(6);
                 }

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -14,145 +14,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 3}
-  - {fileID: 5}
+  - {fileID: 6}
+  - {fileID: 8}
   - {fileID: 10}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2543
-    height: 1291
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: -1
+  controlID: 56
   draggingID: 0
 --- !u!114 &2
-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: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 9
-    y: 81
-    width: 1357
-    height: 1270
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1624}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000011000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    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_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 1357
-      height: 1249
-    m_Scale: {x: 0.7690887, y: 0.7690887}
-    m_Translation: {x: 678.5, y: 624.5}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -882.21295
-      y: -812
-      width: 1764.4259
-      height: 1624
-    m_MinimalGUI: 1
-  m_defaultScale: 0.7690887
-  m_LastWindowPixelSize: {x: 1357, y: 1270}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000001000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
---- !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: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1358
-    height: 1291
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 2}
-  m_Panes:
-  - {fileID: 4}
-  - {fileID: 2}
-  m_Selected: 1
-  m_LastSelected: 0
---- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -172,10 +48,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 9
-    y: 81
-    width: 1232
-    height: 1270
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -190,8 +66,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -174, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: -179, y: -1}
+      snapOffsetDelta: {x: 0, y: -25}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -411,7 +287,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -536,6 +412,19 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: UnityEditor.SceneViewCameraOverlay
+      index: 13
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
   m_Gizmos: 1
@@ -547,9 +436,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -1.1012822, y: -0.059301447, z: 0.0030762358}
+    m_Target: {x: 0.3333356, y: -0.2963123, z: 0.029218119}
     speed: 2
-    m_Value: {x: -1.0137755, y: -0.06058831, z: 0.0046616523}
+    m_Value: {x: 0.3333356, y: -0.2963123, z: 0.029218119}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -558,7 +447,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -579,7 +468,7 @@ MonoBehaviour:
       m_Fade:
         m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -597,11 +486,11 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: -0.000000020936515, y: 0.00000058862963, z: -0.00000001785738, w: -1.0000001}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 3.681692
+    m_Target: 5.133113
     speed: 2
-    m_Value: 3.5231502
+    m_Value: 5.133113
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -621,14 +510,14 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.023056993, y: 0.6482468, z: -0.019666, w: -0.76098496}
-  m_LastSceneViewOrtho: 1
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &5
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -636,24 +525,194 @@ MonoBehaviour:
   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_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 6}
-  - {fileID: 8}
+  m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1358
+    x: 0
     y: 0
-    width: 244
-    height: 1291
+    width: 1209
+    height: 1299
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 2}
+  m_Panes:
+  - {fileID: 2}
+  - {fileID: 4}
+  - {fileID: 5}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !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: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 750, y: 1624}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    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_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 0
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 1208
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 604, y: 628.5}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -780.34686
+      y: -812
+      width: 1560.6937
+      height: 1624
+    m_MinimalGUI: 1
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 1208, y: 1278}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000001000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
+--- !u!114 &5
+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: 12914, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
   m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 716
-  draggingID: 0
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Animator
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ViewTransforms:
+    m_KeySerializationHelper:
+    - {fileID: -3440584703619950180, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+    m_ValueSerializationHelper:
+    - e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+  m_PreviewAnimator: {fileID: 0}
+  m_AnimatorController: {fileID: 9100000, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+  m_BreadCrumbs:
+  - m_Target: {fileID: -3440584703619950180, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+    m_ScrollPosition: {x: 0, y: 0}
+  stateMachineGraph: {fileID: 0}
+  stateMachineGraphGUI: {fileID: 0}
+  blendTreeGraph: {fileID: 0}
+  blendTreeGraphGUI: {fileID: 0}
+  m_AutoLiveLink: 1
+  m_MiniTool: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_CurrentEditor: 0
+  m_LayerEditor:
+    m_SelectedLayerIndex: 0
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -662,19 +721,19 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
+  m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneHierarchyWindow
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1209
     y: 0
-    width: 244
-    height: 861
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 411
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 7}
   m_Panes:
   - {fileID: 7}
@@ -700,10 +759,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1367
-    y: 81
-    width: 242
-    height: 840
+    x: 1209
+    y: 73
+    width: 409
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -717,9 +776,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: 10b10000
       m_LastClickedID: 0
-      m_ExpandedIDs: 1a40f8ff8240f8ffa440f8ff3889f8ff3e89f8ff608af8ff788af8ff7c8af8ff8e8af8ff3214faff6e14faff7414faff7cfaffff
+      m_ExpandedIDs: 78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -735,7 +794,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 0}
+        m_ClientGUIView: {fileID: 6}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -744,92 +803,6 @@ MonoBehaviour:
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
 --- !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: ConsoleWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 861
-    width: 244
-    height: 430
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
-  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}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 1367
-    y: 942
-    width: 242
-    height: 409
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
---- !u!114 &10
-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: 11}
-  - {fileID: 13}
-  m_Position:
-    serializedVersion: 2
-    x: 1602
-    y: 0
-    width: 941
-    height: 1291
-  m_MinSize: {x: 200, y: 50}
-  m_MaxSize: {x: 16192, y: 8096}
-  vertical: 0
-  controlID: 656
-  draggingID: 0
---- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -839,23 +812,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1620
     y: 0
-    width: 507
-    height: 1291
+    width: 367
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 9}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 9}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -875,10 +848,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1
-    y: 19
-    width: 505
-    height: 1270
+    x: 1620
+    y: 73
+    width: 365
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -890,7 +863,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: gamerun
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -900,24 +873,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/Font
+    - Assets/Res/UI/GuidePanel
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: gamerun
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/Font
-  m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\Server\NetServer\NetServer\XiuXianGame
+  - Assets/Res/UI/GuidePanel
+  m_LastFoldersGridSize: -1
+  m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 139}
-    m_SelectedIDs: fcc80000
-    m_LastClickedID: 51452
-    m_ExpandedIDs: 00000000266a000014c6000016c6000018c600001ac600001cc600001ec6000020c6000022c6000024c6000026c6000028c600002ac600002cc600002ec6000030c6000032c6000034c6000036c6000038c600003ac600000cc9000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: dacb0000
+    m_LastClickedID: 52186
+    m_ExpandedIDs: 0000000068cb00006acb00006ccb00006ecb000070cb000072cb000074cb000076cb000078cb00007acb00007ccb0000becb000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -933,7 +906,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 8}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -945,7 +918,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000266a000014c6000016c6000018c600001ac600001cc600001ec6000020c6000022c6000024c6000026c6000028c600002ac600002cc600002ec6000030c6000032c6000034c6000036c6000038c600003ac60000
+    m_ExpandedIDs: 0000000068cb00006acb00006ccb00006ecb000070cb000072cb000074cb000076cb000078cb00007acb00007ccb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -970,26 +943,26 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: 10b10000
+    m_LastClickedInstanceID: 45328
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: kt
-      m_OriginalName: kt
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 53542
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 11}
+      m_ClientGUIView: {fileID: 8}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1000,8 +973,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 256
---- !u!114 &13
+  m_DirectoriesAreaWidth: 115
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1009,25 +982,25 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
+  m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 507
+    x: 1987
     y: 0
-    width: 434
-    height: 1291
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+    width: 573
+    height: 1299
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1047,10 +1020,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 508
-    y: 19
-    width: 433
-    height: 1270
+    x: 1987
+    y: 73
+    width: 572
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0

UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,30 @@
 %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: -1948
+    y: 365
+    width: 1189
+    height: 662
+  m_ShowMode: 0
+  m_Title: Console
+  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}
@@ -14,17 +38,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 1170
-    y: 75
-    width: 1027
-    height: 1224
+    x: 0
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
-  m_RootView: {fileID: 4}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 0
---- !u!114 &2
+  m_Maximized: 1
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -34,25 +58,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectSettingsWindow
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 470
-    width: 501
-    height: 704
-  m_MinSize: {x: 310, y: 200}
+    y: 0
+    width: 1189
+    height: 662
+  m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 10}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 12}
-  - {fileID: 11}
-  - {fileID: 10}
-  m_Selected: 2
-  m_LastSelected: 1
---- !u!114 &3
+  - {fileID: 13}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -65,20 +87,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 2}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
-    x: 526
+    x: 0
     y: 0
-    width: 501
-    height: 1174
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 249
+    width: 1189
+    height: 662
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 14783
   draggingID: 0
---- !u!114 &4
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -91,22 +112,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 5}
   - {fileID: 6}
   - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1027
-    height: 1224
+    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 &5
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -123,12 +144,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1027
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: zouge
---- !u!114 &6
+  m_LastLoadedLayoutName: 
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -141,20 +162,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 12}
   - {fileID: 9}
-  - {fileID: 3}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1027
-    height: 1174
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 248
+  controlID: 123
   draggingID: 0
---- !u!114 &7
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -170,12 +193,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1204
-    width: 1027
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &8
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -185,24 +208,75 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1209
+    y: 0
+    width: 411
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
+  m_Panes:
+  - {fileID: 15}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &10
+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: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 1620
     y: 0
-    width: 501
-    height: 470
+    width: 367
+    height: 1299
+  m_MinSize: {x: 232, y: 271}
+  m_MaxSize: {x: 10002, y: 10021}
+  m_ActualView: {fileID: 17}
+  m_Panes:
+  - {fileID: 17}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &11
+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: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 1987
+    y: 0
+    width: 573
+    height: 1299
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 16}
   m_Selected: 0
-  m_LastSelected: 1
---- !u!114 &9
+  m_LastSelected: 0
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -212,24 +286,25 @@ 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:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 526
-    height: 1174
+    width: 1209
+    height: 1299
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 16}
-  - {fileID: 15}
-  m_Selected: 1
-  m_LastSelected: 0
---- !u!114 &10
+  - {fileID: 19}
+  - {fileID: 18}
+  - {fileID: 14}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -238,21 +313,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_MinSize: {x: 310, y: 200}
+  m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Project Settings
-    m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1696
-    y: 575
-    width: 500
-    height: 683
+    x: -1948
+    y: 365
+    width: 1189
+    height: 641
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -263,34 +338,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  m_PosLeft: {x: 0, y: 0}
-  m_PosRight: {x: 0, y: 0}
-  m_Scope: 1
-  m_SplitterFlex: 0.2
-  m_SearchText: 
-  m_TreeViewState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 23e57dba
-    m_LastClickedID: -1166154461
-    m_ExpandedIDs: a01a5fa653336be20000000007f2324dc53aba5a
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 0
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
---- !u!114 &11
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -299,21 +347,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Animator
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1696
-    y: 575
-    width: 500
-    height: 683
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -324,7 +372,43 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &12
+  m_ViewTransforms:
+    m_KeySerializationHelper:
+    - {fileID: -3440584703619950180, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+    m_ValueSerializationHelper:
+    - e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+  m_PreviewAnimator: {fileID: 0}
+  m_AnimatorController: {fileID: 9100000, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+  m_BreadCrumbs:
+  - m_Target: {fileID: -3440584703619950180, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+    m_ScrollPosition: {x: 0, y: 0}
+  stateMachineGraph: {fileID: 0}
+  stateMachineGraphGUI: {fileID: 0}
+  blendTreeGraph: {fileID: 0}
+  blendTreeGraphGUI: {fileID: 0}
+  m_AutoLiveLink: 1
+  m_MiniTool: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_CurrentEditor: 0
+  m_LayerEditor:
+    m_SelectedLayerIndex: 0
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -344,10 +428,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1696
-    y: 575
-    width: 500
-    height: 683
+    x: 1209
+    y: 73
+    width: 409
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -361,25 +445,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: a6130100
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 64f8feff3c09ffffd0c1ffff
+      m_ExpandedIDs: 56f8ffff68f8ffff7af8ffff84f8ffff90f8ffff4efaffff68faffff76faffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: GuideHand
+        m_OriginalName: GuideHand
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -465330
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 0}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -387,7 +471,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &13
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -407,10 +491,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1696
-    y: 105
-    width: 500
-    height: 449
+    x: 1987
+    y: 73
+    width: 572
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -434,7 +518,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &14
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -454,10 +538,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1696
-    y: 105
-    width: 500
-    height: 449
+    x: 1620
+    y: 73
+    width: 365
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -469,7 +553,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: gamerun
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -479,24 +563,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/GameConfig
+    - Assets/Res/UI/GuidePanel
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: gamerun
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/GameConfig
-  m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\UGit\XiuXianGame
+  - Assets/Res/UI/GuidePanel
+  m_LastFoldersGridSize: -1
+  m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 125}
-    m_SelectedIDs: aab90000
-    m_LastClickedID: 47530
-    m_ExpandedIDs: 000000001e220100d022010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: f6cb0000
+    m_LastClickedID: 52214
+    m_ExpandedIDs: 0000000058cb00005acb00005ccb00005ecb000060cb000062cb000064cb000066cb000068cb00006acb00006ccb0000aacb000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -512,7 +596,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 10}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -524,7 +608,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000001e22010000ca9a3bffffff7f
+    m_ExpandedIDs: 0000000058cb00005acb00005ccb00005ecb000060cb000062cb000064cb000066cb000068cb00006acb00006ccb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -549,26 +633,26 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: a6130100
-    m_LastClickedInstanceID: 70566
-    m_HadKeyboardFocusLastEvent: 0
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: PlacesInfoPanel
+      m_OriginalName: PlacesInfoPanel
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 94802
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -579,8 +663,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 256
---- !u!114 &15
+  m_DirectoriesAreaWidth: 115
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -600,10 +684,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1170
-    y: 105
-    width: 525
-    height: 1153
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -629,7 +713,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -647,7 +731,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -656,29 +740,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 525
-      height: 1132
-    m_Scale: {x: 0.6970443, y: 0.6970443}
-    m_Translation: {x: 262.5, y: 566}
+      width: 1208
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 604, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -376.59012
+      x: -780.34686
       y: -812
-      width: 753.18024
+      width: 1560.6937
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.6970443
-  m_LastWindowPixelSize: {x: 525, y: 1153}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 1208, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &16
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -700,7 +784,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 1917
+    width: 1208
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -716,8 +800,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -174, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: -179, y: -1}
+      snapOffsetDelta: {x: 0, y: -25}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -937,7 +1021,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -1062,6 +1146,19 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: UnityEditor.SceneViewCameraOverlay
+      index: 13
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
   m_Gizmos: 1
@@ -1073,9 +1170,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -73.29077, y: -9436.352, z: -2.666277}
+    m_Target: {x: 0.3333356, y: -0.2963123, z: 0.029218119}
     speed: 2
-    m_Value: {x: -73.29077, y: -9436.352, z: -2.666277}
+    m_Value: {x: 0.3333356, y: -0.2963123, z: 0.029218119}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1125,9 +1222,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 269.5483
+    m_Target: 5.133113
     speed: 2
-    m_Value: 269.5483
+    m_Value: 5.133113
   m_Ortho:
     m_Target: 1
     speed: 2