修改bug

Assets/Res/Config/EventConfig.json

@@ -958,7 +958,7 @@
         100,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 2,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -969,7 +969,7 @@
       "PrizeNums": [
         -5
       ],
-      "RefreshProbability": 500,
+      "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -988,7 +988,7 @@
         100,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 2,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -999,7 +999,7 @@
       "PrizeNums": [
         -5
       ],
-      "RefreshProbability": 500,
+      "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1019,7 +1019,7 @@
         100,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 2,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -1030,7 +1030,7 @@
       "PrizeNums": [
         -5
       ],
-      "RefreshProbability": 500,
+      "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1049,7 +1049,7 @@
         100,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 2,
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
@@ -1060,7 +1060,7 @@
       "PrizeNums": [
         -5
       ],
-      "RefreshProbability": 500,
+      "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1126,7 +1126,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
@@ -1163,7 +1163,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
@@ -1195,7 +1195,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
@@ -1237,7 +1237,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 2,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
@@ -1271,7 +1271,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 3,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
@@ -1304,7 +1304,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 3,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
@@ -1346,7 +1346,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 3,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
@@ -1377,7 +1377,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 3,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
@@ -1411,7 +1411,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 4,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
@@ -1451,7 +1451,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 4,
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,

Assets/Res/Config/EventLinkConfig.json

@@ -347,7 +347,7 @@
       ],
       "DialogueType": 0,
       "EventID": 0,
-      "optionType": 4,
+      "optionType": 0,
       "PrizeIDs": [
         1002
       ],

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -997,6 +997,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: PLayerNameRoot
+    gameObject: {fileID: 9062071681843881045}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5501269362975452296
 GameObject:
@@ -2248,7 +2253,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2326,7 +2331,7 @@ GameObject:
   - component: {fileID: 8045742727328589985}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: PLayerNameRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -65,7 +65,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///对话NPCID
+		///对话NPCID 0=玩家 -1=不显示
 		/// </summary>
 #if !COMBAT_SERVER
 		public int NPCID;

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
 using Core.Utility;
 using Excel2Json;
 using Fort23.Core;
@@ -34,6 +35,14 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public HeroInfo yindaoHeroData;
 
+    private string playerName;
+
+    public string PlayerName
+    {
+        get { return LanguageManager.Instance.Text(myHero.modelConfig.name); }
+        set { playerName = value; }
+    }
+
 
     public long serverTime => TimeHelper.ServerNow();
     private AccountFileInfo.SmallPlacesData currentPlaces;
@@ -432,6 +441,53 @@ public class PlayerManager : Singleton<PlayerManager>
             isUpdate = false;
         }
     }
+    
+        public async void ChangeMap(int mapId)
+        {
+
+            SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
+            if (smallPlacesConfig.ID == 0)
+                return;
+            AccountFileInfo.SmallPlacesData lastSmallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
+            SmallPlacesConfig lastSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(smallPlacesConfig.ID - 1);
+            if (smallPlacesConfig.ID > 1 && (lastSmallPlacesData == null || lastSmallPlacesData.completionEventCount < lastSmallPlacesConfig.CompletionEventCount))
+            {
+                return;
+            }
+
+            if (lastSmallPlacesConfig.UnlockEnvetid != 0)
+            {
+                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
+                if (eventList == null || !eventList.isCompleted)
+                {
+                 
+                    return;
+                }
+            }
+
+            AccountFileInfo.SmallPlacesData smallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
+
+            if (smallPlacesData == null)
+            {
+                smallPlacesData = new AccountFileInfo.SmallPlacesData();
+                smallPlacesData.id = smallPlacesConfig.ID;
+                AccountFileInfo.Instance.playerData.smallPlacesDatas.Add(smallPlacesData);
+            }
+
+
+            AccountFileInfo.PlacesData currentPlacesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.ID);
+            if (currentPlacesData == null)
+            {
+                currentPlacesData = new AccountFileInfo.PlacesData();
+                currentPlacesData.id = smallPlacesConfig.PlacesId;
+                AccountFileInfo.Instance.playerData.placesDatas.Add(currentPlacesData);
+            }
+
+            PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
+
+  
+            EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
+        }
 
     public void QianKunDaiAward()
     {

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -618,15 +618,81 @@ public class EventSystemManager : Singleton<EventSystemManager>
         {
             if (eventConfig.SmallPlacesId != PlayerManager.Instance.CurrentsmallPlaces.id)
             {
-                TipMessagePanel.OpenTipMessagePanel("需要到对应位置触发");
-                return;
+                
+                
+                AccountFileInfo.SmallPlacesData lastSmallPlacesData = PlayerManager.Instance.GetSmallPlacesData(eventConfig.SmallPlacesId - 1);
+                SmallPlacesConfig lastSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(eventConfig.SmallPlacesId - 1);
+                if (smallPlacesConfig.ID > 1 && (lastSmallPlacesData == null || lastSmallPlacesData.completionEventCount < lastSmallPlacesConfig.CompletionEventCount))
+                {
+                    TipMessagePanel.OpenTipMessagePanel("上一个关卡事件完成度不足,无法切换地图");
+                    return;
+                }
+
+                if (lastSmallPlacesConfig.UnlockEnvetid != 0)
+                {
+                    AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
+                    if (eventList == null || !eventList.isCompleted)
+                    {
+                        TipMessagePanel.OpenTipMessagePanel("上一个关卡事件完成度不足,无法切换地图");
+                        return;
+                    }
+                }
+                
+                
+                
+                UIManager.Instance.HindCurrAllShowPanel();
+                CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+                CombatController.currActiveCombat.CombatHeroController.Flight(2, -90, 10);
+                UIManager.Instance.SetEventSystemEnable(false);
+                await TimerComponent.Instance.WaitAsync(2 * 1000 + 1200);
+                CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
+                UIManager.Instance.SetEventSystemEnable(true);
+                UIManager.Instance.ShowLastHindAllShowPanel();
+                
+                PlayerManager.Instance.ChangeMap(eventConfig.SmallPlacesId);
+                
+                // TipMessagePanel.OpenTipMessagePanel("需要到对应位置触发");
+               // returnurn;
             }
         }
         else if (eventConfig.placeID > 0)
         {
             if (eventConfig.placeID != smallPlacesConfig.PlacesId)
             {
-                TipMessagePanel.OpenTipMessagePanel("需要到对应位置触发");
+                
+                PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
+                
+                
+                AccountFileInfo.SmallPlacesData lastSmallPlacesData = PlayerManager.Instance.GetSmallPlacesData(placesConfig.SmallPlacersIds[0] - 1);
+                SmallPlacesConfig lastSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(placesConfig.SmallPlacersIds[0] - 1);
+                if (smallPlacesConfig.ID > 1 && (lastSmallPlacesData == null || lastSmallPlacesData.completionEventCount < lastSmallPlacesConfig.CompletionEventCount))
+                {
+                    TipMessagePanel.OpenTipMessagePanel("上一个关卡事件完成度不足,无法切换地图");
+                    return;
+                }
+
+                if (lastSmallPlacesConfig.UnlockEnvetid != 0)
+                {
+                    AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
+                    if (eventList == null || !eventList.isCompleted)
+                    {
+                        TipMessagePanel.OpenTipMessagePanel("上一个关卡事件完成度不足,无法切换地图");
+                        return;
+                    }
+                }
+                
+                
+                
+                UIManager.Instance.HindCurrAllShowPanel();
+                CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+                CombatController.currActiveCombat.CombatHeroController.Flight(2, -90, 10);
+                UIManager.Instance.SetEventSystemEnable(false);
+                await TimerComponent.Instance.WaitAsync(2 * 1000 + 1200);
+                CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
+                UIManager.Instance.SetEventSystemEnable(true);
+                UIManager.Instance.ShowLastHindAllShowPanel();
+                
+                PlayerManager.Instance.ChangeMap(placesConfig.SmallPlacersIds[0]);
                 return;
             }
         }

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -160,8 +160,25 @@ namespace Fort23.Mono
                 shownextIcon = nextIcon3;
             }
 
-            EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
-            Text_Name1.text = LanguageManager.Instance.Text(eventNpc.name);
+            if (eventConditionConfig.NPCID == 0)
+            {
+                Text_Name1.text = PlayerManager.Instance.PlayerName;
+                PLayerNameRoot.SetActive(true);
+            }
+            else if (eventConditionConfig.NPCID == -1)
+            {
+                PLayerNameRoot.SetActive(false);
+            }
+            else
+            {
+                PLayerNameRoot.SetActive(true);
+                EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
+                Text_Name1.text = LanguageManager.Instance.Text(eventNpc.name);
+            }
+
+       
+            
+            
 
             StartShowMassge();
         }

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs

@@ -206,6 +206,17 @@ namespace Fort23.Mono
 	      return _Text_Name1;
 	     }
 	   }
+	  private GameObject _PLayerNameRoot;
+	  public GameObject PLayerNameRoot
+	   {
+	   get{
+	      if (_PLayerNameRoot == null)
+	       {
+	         _PLayerNameRoot  = GetUIUnit<GameObject>("PLayerNameRoot"); 
+	       }
+	      return _PLayerNameRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs

@@ -90,12 +90,12 @@ namespace Fort23.Mono
                 Icon_Select.transform.SetParent(Btn_Player.transform);
                 Icon_Select.transform.SetAsFirstSibling();
                 Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-                Text_Name.text = "名称：" + LanguageManager.Instance.Text(PlayerManager.Instance.myHero.modelConfig.name);
+                Text_Name.text = "名称：" + LanguageManager.Instance.Text(PlayerManager.Instance.PlayerName);
 
 
-                Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjie1) +
-                                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjie2) +
-                                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjie3);
+                Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
 
                 Text_Linggen.text = $"金：{PlayerManager.Instance.myHero.Metal} 木：{PlayerManager.Instance.myHero.Wood} 水：{PlayerManager.Instance.myHero.Water} 火：{PlayerManager.Instance.myHero.Fire} 土：{PlayerManager.Instance.myHero.Earth}";
                 Text_Hp.text = PlayerManager.Instance.myHero.hp.Value.ToString();

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

@@ -70,6 +70,7 @@ namespace Fort23.Mono
 
         private async void Click_Go()
         {
+            
             if (smallPlacesConfig.ID == 0)
                 return;
             AccountFileInfo.SmallPlacesData lastSmallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
@@ -90,6 +91,7 @@ namespace Fort23.Mono
                 }
             }
 
+            /*
             AccountFileInfo.SmallPlacesData smallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
 
             if (smallPlacesData == null)
@@ -109,10 +111,13 @@ namespace Fort23.Mono
             }
 
             PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
+            */
+
+            PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
 
             UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
             UIManager.Instance.HideUIUIPanel(this);
-            EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
+            //EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
         }
 
         public static async CTask OpenPanel(int placesId)

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: -1209
+    y: 434
+    width: 892
+    height: 543
+  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}
@@ -19,12 +43,12 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
-  m_RootView: {fileID: 3}
+  m_Title: Inspector
+  m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &2
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -34,23 +58,48 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 548
+    x: 0
     y: 0
-    width: 555
-    height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 15}
+    width: 892
+    height: 543
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !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: 892
+    height: 543
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 1207
+  draggingID: 0
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,9 +112,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 4}
-  - {fileID: 5}
   - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -78,7 +127,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &4
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -100,7 +149,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &5
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -113,23 +162,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 10}
-  - {fileID: 2}
-  - {fileID: 7}
-  - {fileID: 8}
+  - {fileID: 12}
   - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     width: 2560
     height: 1299
-  m_MinSize: {x: 500, y: 50}
-  m_MaxSize: {x: 40480, y: 8096}
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 69
+  controlID: 18
   draggingID: 0
---- !u!114 &6
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -150,7 +198,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &7
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -165,18 +213,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1103
+    x: 1272
     y: 0
-    width: 518
+    width: 348
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -191,18 +239,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1621
+    x: 1620
     y: 0
-    width: 536
+    width: 391
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -217,18 +265,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2157
+    x: 2011
     y: 0
-    width: 403
+    width: 549
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 12}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -245,16 +293,51 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 548
+    width: 1272
     height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 17}
+  - {fileID: 18}
   m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &11
+  m_LastSelected: 1
+--- !u!114 &13
+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: -1209
+    y: 434
+    width: 892
+    height: 522
+  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 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -274,9 +357,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1103
+    x: 1272
     y: 73
-    width: 516
+    width: 346
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -293,23 +376,23 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 1c33b0ff2233b0ff78faffff
+      m_ExpandedIDs: 66faffff34c40000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: tenButton
-        m_OriginalName: tenButton
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 155584
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 4
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 7}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -317,7 +400,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &12
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -337,9 +420,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2157
+    x: 2011
     y: 73
-    width: 402
+    width: 548
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -364,7 +447,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &13
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -384,9 +467,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1621
+    x: 1620
     y: 73
-    width: 534
+    width: 389
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -409,7 +492,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Res/UI/DaoYouPanel
     m_Globs: []
     m_OriginalText: gamerun
     m_ImportLogFlags: 0
@@ -417,16 +500,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets
+  - Assets/Res/UI/DaoYouPanel
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 55}
-    m_SelectedIDs: 1afb0000
-    m_LastClickedID: 64282
-    m_ExpandedIDs: 000000001afb00001cfb00001efb000020fb000022fb000024fb000026fb000028fb00002afb00002cfb000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 198}
+    m_SelectedIDs: 38fc0000
+    m_LastClickedID: 64568
+    m_ExpandedIDs: 0000000028fb00002afb00002cfb00002efb000030fb000032fb000034fb000036fb000038fb00003afb0000aafb00003afc000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -454,7 +537,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000001afb00001cfb00001efb000020fb000022fb000024fb000026fb000028fb00002afb00002cfb0000
+    m_ExpandedIDs: 0000000028fb00002afb00002cfb00002efb000030fb000032fb000034fb000036fb000038fb00003afb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -498,7 +581,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -509,8 +592,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 198
---- !u!114 &14
+  m_DirectoriesAreaWidth: 143
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -532,7 +615,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 547
+    width: 1271
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -550,7 +633,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 547, y: 1257}
+  m_TargetSize: {x: 750, y: 1624}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -559,16 +642,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 07000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -273.5
-    m_HBaseRangeMax: 273.5
-    m_VBaseRangeMin: -628.5
-    m_VBaseRangeMax: 628.5
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -577,7 +660,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
@@ -586,29 +669,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 547
+      width: 1271
       height: 1257
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 273.5, y: 628.5}
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 635.5, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -273.5
-      y: -628.5
-      width: 547
-      height: 1257
+      x: -821.04376
+      y: -812
+      width: 1642.0875
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 547, y: 1278}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 1271, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &15
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -628,9 +711,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 548
+    x: 0
     y: 73
-    width: 553
+    width: 1271
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1003,9 +1086,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.0830562, y: -0.07681619, z: -0.012485113}
+    m_Target: {x: 0.46811348, y: -1.4729519, z: -0.0076534464}
     speed: 2
-    m_Value: {x: -0.0830562, y: -0.07681619, z: -0.012485113}
+    m_Value: {x: 0.46811348, y: -1.4729519, z: -0.0076534464}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1055,9 +1138,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 5.3791
+    m_Target: 4.895939
     speed: 2
-    m_Value: 5.3791
+    m_Value: 4.895939
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1077,7 +1160,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.31362367, y: -0.012097946, z: 0.0046439474, w: 0.9494464}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: