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

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

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.00018357388
+    - _Alpha: 0.43219617
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3386,7 +3386,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab

@@ -521,7 +521,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2740590189241338900
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2022,7 +2022,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5861481284069355833
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -1360,7 +1360,7 @@ namespace Fort23.Mono
         /// <summary>
         /// 设置背景在需要显示背景的ui下面
         /// </summary>
-        public async void SetBackgroundPanel(UIPanel uiBase)
+        public async CTask SetBackgroundPanel(UIPanel uiBase)
         {
             if (AllShowBGUIs.Contains(uiBase))
             {

Assets/Scripts/Core/UI/Core/UIPanel.cs

@@ -223,7 +223,7 @@ namespace Fort23.Mono
         /// <summary>
         /// 关闭界面
         /// </summary>
-        public virtual async void Close()
+        public virtual async CTask Close()
         {
             if (IsClose)
             {
@@ -236,7 +236,7 @@ namespace Fort23.Mono
             IsClose = true;
             GObjectPoolInterface?.transform.SetSiblingIndex(0); //关闭界面的时候将他放在底部
             if (IsShowCustomBGPanel)
-                UIManager.Instance.SetBackgroundPanel(this);
+                await UIManager.Instance.SetBackgroundPanel(this);
 
 
             if (this == UIManager.Instance.currOpenPanel)

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1001,27 +1001,31 @@ public class EventSystemManager : Singleton<EventSystemManager>
         if (evt.ID == 0)
             return false;
 
-        switch (evt.EventConditionId)
+        for (var i = 0; i < evt.EventConditionId.Length; i++)
         {
-            //背包道具检测
-            case 1:
-                return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[0]) >= evt.EventCount;
-            //境界判断
-            case 2:
-                return PlayerManager.Instance.myHero.level >= evt.EventCount;
-            //概率判断
-            case 3:
-                int randomValue1 = Random.Range(0, 1001);
-
-                return randomValue1 <= evt.EventCount;
-            //完成事件判断
-            case 10:
-                AccountFileInfo.EventList eventList =
-                    AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
-                        ce.eventID == evt.EventValue[0]);
-                return eventList != null;
+            switch (evt.EventConditionId[i])
+            {
+                //背包道具检测
+                case 1:
+                    return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i];
+                //境界判断
+                case 2:
+                    return PlayerManager.Instance.myHero.level >= evt.EventCount[i];
+                //概率判断
+                case 3:
+                    int randomValue1 = Random.Range(0, 1001);
+
+                    return randomValue1 <= evt.EventCount[i];
+                //完成事件判断
+                case 10:
+                    AccountFileInfo.EventList eventList =
+                        AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
+                            ce.eventID == evt.EventValue[i]);
+                    return eventList != null;
+            }
         }
 
+
         return true;
     }
 

Assets/Scripts/GameUI/UI/BackgroundPanel/BackgroundPanel.cs

@@ -235,10 +235,10 @@ namespace Fort23.Mono
         {
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             EnableBGBtn = true;
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -80,7 +80,7 @@ namespace Fort23.Mono
             return battleSettlementPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             AudioManager.Instance.UnPauseBGM();
             foreach (var skipToWidget in skipToWidgets)
@@ -90,7 +90,7 @@ namespace Fort23.Mono
 
             skipToWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -145,10 +145,10 @@ namespace Fort23.Mono
             EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             CombatController.currActiveCombat.isUpdate = true;
-            base.Close();
+            await base.Close();
         }
 
         public void OpenPanel()

Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -192,7 +192,7 @@ namespace Fort23.Mono
             return default;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             // foreach (var widgetItem in widgetItems)
             // {
@@ -214,7 +214,7 @@ namespace Fort23.Mono
                 OpenBoxScorePanel.OpenPanel();
             }
 
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask OpenPanel(List<ItemInfo> itemInfos, int type, int configId)

Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanel.cs

@@ -174,7 +174,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<OpenBoxScorePanel>(null, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var summonScoreRuleWidget in summonScoreRuleWidgets)
             {
@@ -192,7 +192,7 @@ namespace Fort23.Mono
 
             AwardSummonScore();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ChatPanel/ChatPanel.cs

@@ -106,13 +106,13 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<ChatPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             EventSystemManager.Instance.isOpenUi = false;
             isSend = false;
             UIManager.Instance.DormancyAllGComponent<ChatMessageWidget>();
             messages.Clear();
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -156,12 +156,12 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             _duiPingWidgets.Clear();
             UIManager.Instance.DormancyAllGComponent<HeroHpWidget>();
             UIManager.Instance.DormancyAllGComponent<DuiPingWidget>();
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -1256,7 +1256,7 @@ namespace Fort23.Mono
             _skillWidgets.Remove(widget as SkillWidget);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var skillWidget in _skillWidgets)
             {
@@ -1281,7 +1281,7 @@ namespace Fort23.Mono
             _wuXingGongFaWidgets.Clear();
             CloseSelect();
             // ChangeInfoType(1);
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -77,7 +77,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DaoYouGuaJiAwardPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoYouGuaJiAwardWidget in _daoYouGuaJiAwardWidgets)
             {
@@ -86,7 +86,7 @@ namespace Fort23.Mono
 
             _daoYouGuaJiAwardWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -53,7 +53,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DaoYouGuaJiPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoYouGuaJiWidget in widgets)
             {
@@ -62,7 +62,7 @@ namespace Fort23.Mono
 
             widgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -522,7 +522,7 @@ namespace Fort23.Mono
             widgetItem1 = null;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             daoyouGiftConfigs = null;
 
@@ -557,7 +557,7 @@ namespace Fort23.Mono
 
             ClosePoolGive();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -109,7 +109,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DaoYouInvitePanel>(null, UILayer.Top,isShowBG:true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoYouWidget in _daoYouWidgets)
             {
@@ -126,7 +126,7 @@ namespace Fort23.Mono
             _daoYouaaFfixWidgets.Clear();
 
             addDaoYouWidget = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -61,7 +61,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DaoYouPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoYouWidget in daoYouWidgets)
             {
@@ -69,7 +69,7 @@ namespace Fort23.Mono
             }
             daoYouWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -185,14 +185,14 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyAllGComponent<DialogueOptionWidget>();
             _isShowingOptions = false;
             _skipTyping = false;
             _timerEntity?.Dispose();
             _timerEntity = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -420,7 +420,7 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyAllGComponent<DialogueOptionWidget>();
             _isShowingOptions = false;
@@ -436,7 +436,7 @@ namespace Fort23.Mono
             // DialgueType2.gameObject.SetActive(false);
             // OptionMarsk.SetActive(false);
             isOver = false;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -224,7 +224,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var faBaoWidget in gongFaWidgetType2s)
             {
@@ -242,7 +242,7 @@ namespace Fort23.Mono
             Icon_Select.transform.SetParent(transform);
             Icon_Select.transform.SetAsFirstSibling();
             result?.SetResult(isOk);
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask<bool> OpenPanel(int levebattleId)

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

@@ -267,7 +267,7 @@ namespace Fort23.Mono
             return divineSenceEventPreviewPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
             shengShiEventWidgetTypeList.Clear();
@@ -275,7 +275,7 @@ namespace Fort23.Mono
             saixuanType = 1;
             mainShengShiEventWidgetType2 = null;
             isTriggerEvent = false;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -157,7 +157,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<DivineSenceItemPanel>(null, UILayer.Top, uiData: new object[] { selectItemInit, selectType,itemId, cancelCallBack },isShowBG:true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var divineSenceItemWidget in _divineSenceItemWidgets)
             {
@@ -169,7 +169,7 @@ namespace Fort23.Mono
             itemInfos2.Clear();
             selectItemInit = null;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -79,7 +79,7 @@ namespace Fort23.Mono
             return await callBack;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var skipToWidget in skipToWidgets)
             {
@@ -90,7 +90,7 @@ namespace Fort23.Mono
             callBack?.SetResult(isSkipto);
             isSkipto = false;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -458,7 +458,7 @@ namespace Fort23.Mono
             return gongFaUpgradePanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
             {
@@ -482,7 +482,7 @@ namespace Fort23.Mono
             isUpStar = false;
             isUpGrad = false;
             _skillInfo = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/SkillRoadSelecPanel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Core.Language;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 
 namespace Fort23.Mono
@@ -76,7 +77,7 @@ namespace Fort23.Mono
             skillRoadSelecPanel.CustomInit(currentSelectId,callBack);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var skillRoadWidget in _skillRoadWidgets)
             {
@@ -85,7 +86,7 @@ namespace Fort23.Mono
 
             _skillRoadWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/GuidePanel/GraphicHelpPanel.cs

@@ -130,12 +130,12 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             GObjectPool.Instance.Recycle(GameObjectPool);
             GameObjectPool = null;
             CloseBtn.onClick.RemoveAllListeners();
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -106,9 +106,9 @@ namespace Fort23.Mono
             OnClickMask.GetComponent<RectTransform>().sizeDelta = size;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
-            base.Close();
+            await base.Close();
             PlayerGuideManager.Instance._timerEntity?.Dispose();
             PlayerGuideManager.Instance._timerEntity = null;
         }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -62,7 +62,8 @@ namespace Fort23.Mono
                 }
 
 
-                if (PlayerManager.Instance.myHero.heroData.exp + HeroHerlp.GetHeroExp() < PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
+                if (PlayerManager.Instance.myHero.heroData.exp + HeroHerlp.GetHeroExp() <
+                    PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
                 {
                     return;
                 }
@@ -78,7 +79,9 @@ namespace Fort23.Mono
                     bool isHave = false;
                     for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
                     {
-                        if (breakthroughItemWidgets[i1].itemInfo != null && PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i] == breakthroughItemWidgets[i1].itemInfo.itemID)
+                        if (breakthroughItemWidgets[i1].itemInfo != null &&
+                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i] ==
+                            breakthroughItemWidgets[i1].itemInfo.itemID)
                         {
                             isHave = true;
                         }
@@ -86,7 +89,9 @@ namespace Fort23.Mono
 
                     if (!isHave)
                     {
-                        ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i]);
+                        ItemConfig itemConfig =
+                            ConfigComponent.Instance.Get<ItemConfig>(PlayerManager.Instance.myHero.powerUpConfig
+                                .DujieMustItemIDs[i]);
                         string tips = "缺少" + LanguageManager.Instance.Text(itemConfig.itemName);
                         TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel(tips);
                         return;
@@ -118,17 +123,20 @@ namespace Fort23.Mono
                     bool isTuPoSuccess = true;
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
                     {
-                        if (PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages != null && PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages.Length > 1)
+                        if (PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages != null &&
+                            PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages.Length > 1)
                         {
                             type1 = 3;
-                            ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0], PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
+                            ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0],
+                                PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
                             //渡劫失败
                             if (ramdomValue >= PlayerManager.Instance.myHero.hp.Value)
                             {
                                 isTuPoSuccess = false;
                                 RemoveHeroItem(list[1]);
-                             
-                                HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(3, list[1]);
+
+                                HeroBreakthroughFailPanel heroBreakthroughFailPanel =
+                                    await HeroBreakthroughFailPanel.OpenPanel(3, list[1]);
                                 await heroBreakthroughFailPanel.UIClosed();
                                 // TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("雷劫失败");
                                 // await tipMessage.UIClosed();
@@ -147,7 +155,8 @@ namespace Fort23.Mono
                 {
                     RemoveHeroItem(list[1]);
                     AudioManager.Instance.PlayAudio("ui_tuposhiba.wav");
-                    HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
+                    HeroBreakthroughFailPanel heroBreakthroughFailPanel =
+                        await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
                     await heroBreakthroughFailPanel.UIClosed();
                 }
 
@@ -188,7 +197,9 @@ namespace Fort23.Mono
         private void RemoveHeroItem(int failBl)
         {
             //扣除失败后的经验
-            float failbl = failBl == 0 ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * failBl * 0.01f);
+            float failbl = failBl == 0
+                ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce
+                : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * failBl * 0.01f);
             int failXw = (int)(PlayerManager.Instance.myHero.powerUpConfig.levelUpExp * failbl * 0.01f);
             float allexp = HeroHerlp.GetHeroExp();
             PlayerManager.Instance.myHero.heroData.exp += allexp;
@@ -204,7 +215,8 @@ namespace Fort23.Mono
             //小突破
             if (type == 1)
             {
-                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
+                heroAttributData =
+                    HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
             }
             //大突破
             else if (type == 2)
@@ -218,7 +230,8 @@ namespace Fort23.Mono
             }
 
             PlayerManager.Instance.myHero.Upgrade();
-            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
             await heroBreakthroughSuccessPanel.UIClosed();
         }
 
@@ -228,7 +241,8 @@ namespace Fort23.Mono
             type = 1;
             heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
             nextHeroInfo = PlayerManager.Instance.myHero.CopyHero();
-            nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
+            nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
 
             Text_CurrrentJIngjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
                                         LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
@@ -237,14 +251,18 @@ namespace Fort23.Mono
             Text_NextJinfjie.text = LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[0]) +
                                     LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[1]) +
                                     LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[2]);
-            
-            
-            LevelbattleConfig  levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
+
+
+            LevelbattleConfig levelbattleConfig =
+                ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
             GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
-            HeroModelConfig heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
-            MonsterPowerUpConfig monsterPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+            HeroModelConfig heroModelConfig =
+                ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
+            MonsterPowerUpConfig monsterPowerUpConfig =
+                ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
 
-            Text_CombatTitle.text = $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1) }{ LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2) }{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
+            Text_CombatTitle.text =
+                $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
 
             if (heroPowerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
             {
@@ -307,36 +325,45 @@ namespace Fort23.Mono
             Btn_Affirm.transform.RecoverColor();
 
 
-            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer = new CTaskAwaitBuffer<BreakthroughItemWidget>())
+            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
+                   new CTaskAwaitBuffer<BreakthroughItemWidget>())
             {
-                for (int i = 0; i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length; i++)
+                for (int i = 0;
+                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                     i++)
                 {
-                    cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
+                    cTaskAwaitBuffer.AddTask(
+                        UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
                 }
 
                 breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
 
-                breakthroughItemWidgets[0].CustomInit(1, 0,false);
+                breakthroughItemWidgets[0].CustomInit(1, 0, false);
 
 
                 //必选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i],true);
+                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
                 }
 
                 //可选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1].CustomInit(2, heroPowerUpConfig.DujieItemIDs[i],false);
+                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
+                        .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
                 }
 
                 for (var i = 0; i < breakthroughItemWidgets.Count; i++)
                 {
-                    breakthroughItemWidgets[i].transform.anchoredPosition = new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
+                    breakthroughItemWidgets[i].transform.anchoredPosition =
+                        new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
                 }
 
-                Content.sizeDelta = new Vector2((breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count, 200);
+                Content.sizeDelta =
+                    new Vector2(
+                        (breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count,
+                        200);
             }
         }
 
@@ -354,7 +381,8 @@ namespace Fort23.Mono
                 bool isHave = false;
                 for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
                 {
-                    if (breakthroughItemWidgets[i1].itemInfo != null && hero.powerUpConfig.DujieMustItemIDs[i] == breakthroughItemWidgets[i1].itemInfo.itemID)
+                    if (breakthroughItemWidgets[i1].itemInfo != null && hero.powerUpConfig.DujieMustItemIDs[i] ==
+                        breakthroughItemWidgets[i1].itemInfo.itemID)
                     {
                         isHave = true;
                     }
@@ -373,7 +401,9 @@ namespace Fort23.Mono
 
             var list = GetBl();
 
-            failbl = list[1] == 0 ? hero.powerUpConfig.FailureExpReduce : (float)(hero.powerUpConfig.FailureExpReduce * list[1] * 0.01f);
+            failbl = list[1] == 0
+                ? hero.powerUpConfig.FailureExpReduce
+                : (float)(hero.powerUpConfig.FailureExpReduce * list[1] * 0.01f);
             successBl = list[0];
 
             if (isCan)
@@ -458,7 +488,8 @@ namespace Fort23.Mono
 
         public async static CTask<HeroBreakthroughPanel> OpenPanel()
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
+            HeroBreakthroughPanel heroBreakthroughPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
             heroBreakthroughPanel.CustomInit();
             return heroBreakthroughPanel;
         }
@@ -467,7 +498,8 @@ namespace Fort23.Mono
         //渡劫预览
         public async static CTask<HeroBreakthroughPanel> OpenPanel1(HeroInfo heroInfo1)
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
+            HeroBreakthroughPanel heroBreakthroughPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
             heroBreakthroughPanel.CustomInit(heroInfo1);
             return heroBreakthroughPanel;
         }
@@ -477,7 +509,8 @@ namespace Fort23.Mono
             type = 2;
             heroPowerUpConfig = heroInfo1.powerUpConfig;
             nextHeroInfo = PlayerManager.Instance.myHero.CopyHero();
-            nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, heroInfo1.heroData.heroPowerId + 1);
+            nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                heroInfo1.heroData.heroPowerId + 1);
 
             Text_CurrrentJIngjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
                                         LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
@@ -548,40 +581,63 @@ namespace Fort23.Mono
             Btn_Affirm.transform.Gray(false);
 
 
-            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer = new CTaskAwaitBuffer<BreakthroughItemWidget>())
+            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
+                   new CTaskAwaitBuffer<BreakthroughItemWidget>())
             {
-                for (int i = 0; i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length; i++)
+                for (int i = 0;
+                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                     i++)
                 {
-                    cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
+                    cTaskAwaitBuffer.AddTask(
+                        UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
                 }
 
                 breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
 
-                breakthroughItemWidgets[0].CustomInit(1, 0,false);
+                breakthroughItemWidgets[0].CustomInit(1, 0, false);
 
 
                 //必选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i],true);
+                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
                 }
 
                 //可选道具
                 for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
                 {
-                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1].CustomInit(2, heroPowerUpConfig.DujieItemIDs[i],false);
+                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
+                        .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
                 }
 
                 for (var i = 0; i < breakthroughItemWidgets.Count; i++)
                 {
-                    breakthroughItemWidgets[i].transform.anchoredPosition = new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
+                    breakthroughItemWidgets[i].transform.anchoredPosition =
+                        new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
                 }
 
-                Content.sizeDelta = new Vector2((breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count, 200);
+                Content.sizeDelta =
+                    new Vector2(
+                        (breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count,
+                        200);
             }
         }
 
-        public override void Close()
+
+        // [CustomMethod(CustomMethodType.Update)]
+        // public async void Update()
+        // {
+        //     if (Input.GetKeyDown(KeyCode.Y))
+        //     {
+        //         HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(3, 10);
+        //         await heroBreakthroughFailPanel.UIClosed();
+        //
+        //
+        //         // UIManager.Instance.HideUIUIPanel(this);
+        //     }
+        // }
+
+        public async override CTask Close()
         {
             foreach (var breakthroughItemWidget in breakthroughItemWidgets)
             {
@@ -594,7 +650,7 @@ namespace Fort23.Mono
 
             type = 0;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanel.cs

@@ -81,7 +81,7 @@ namespace Fort23.Mono
             LayoutRebuilder.ForceRebuildLayoutImmediate(AttributeRoot.parent.GetComponent<RectTransform>());
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var heroAttributeWidget in heroAttributeWidgets)
             {
@@ -90,7 +90,7 @@ namespace Fort23.Mono
 
             heroAttributeWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -307,10 +307,10 @@ namespace Fort23.Mono
             return heroInformationPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             ClosePool();
-            base.Close();
+            await base.Close();
         }
 
         private void ClosePool()

Assets/Scripts/GameUI/UI/HeroInformationPanel/ImmortalBondPanel.cs

@@ -193,7 +193,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<ImmortalBondPanel>(null);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var daoLvSkillWidget in _daoLvSkillWidgets)
             {
@@ -203,7 +203,7 @@ namespace Fort23.Mono
             _daoLvSkillWidgets.Clear();
 
             UIManager.Instance.DormancyAllGComponent<DaoYouWidget>();
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectBreakthroughItemPanel.cs

@@ -101,14 +101,14 @@ namespace Fort23.Mono
           
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             breakthrough.Icon_Select.gameObject.SetActive(false);
             breakthrough.transform.SetParent(weidgetFater);
             weidgetFater = null;
             breakthrough = null;
             callBack = null;
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask<SelectBreakthroughItemPanel> OpenPanel(BreakthroughItemWidget breakthroughItemWidget, Action callBack)

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs

@@ -152,7 +152,7 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             elixirItems.ForEach(e => UIManager.Instance.DormancyGComponent(e));
             elixirItems.Clear();
@@ -163,7 +163,7 @@ namespace Fort23.Mono
             breakthrough = null;
             weidgetFater = null;
             SelectWidget(null);
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask<SelectElixirPanel> OpenPanel(BreakthroughItemWidget itemInfo, Action<ElixirItemWidget> callback = null)

Assets/Scripts/GameUI/UI/HeroInformationPanel/UseExpElixirPanel.cs

@@ -79,7 +79,7 @@ namespace Fort23.Mono
             return useExpElixirPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var expElixirItemWidget in _expElixirItemWidgets)
             {
@@ -88,7 +88,7 @@ namespace Fort23.Mono
 
             _expElixirItemWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanel.cs

@@ -172,7 +172,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var faBaoAttributeWidget in faBaoWidgets)
             {
@@ -193,7 +193,7 @@ namespace Fort23.Mono
             currentFaBaoWidget = null;
             currentFaBaoInfo = null;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanel.cs

@@ -155,7 +155,7 @@ namespace Fort23.Mono
             return gongFaUpgradePanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
             {
@@ -178,7 +178,7 @@ namespace Fort23.Mono
             isUpStar = false;
             isUpGrad = false;
             _skillInfo = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -82,7 +82,7 @@ namespace Fort23.Mono
                 uiData: new object[] { itemInfo }, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var itemDetailsWidget in itemDetailsWidgets)
             {
@@ -91,7 +91,7 @@ namespace Fort23.Mono
 
             itemDetailsWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemSourcePanel.cs

@@ -76,7 +76,7 @@ namespace Fort23.Mono
             return await callBack;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var skipToWidget in skipToWidgets)
             {
@@ -87,7 +87,7 @@ namespace Fort23.Mono
             callBack?.SetResult(isSkipto);
             isSkipto = false;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -175,13 +175,13 @@ namespace Fort23.Mono
             levelChoosePanel.CustomInit();
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             placesItem?.Dispose();
             placesItem = null;
             _bigMapItem?.Dispose();
             _bigMapItem = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -67,16 +67,18 @@ namespace Fort23.Mono
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
             Text_BigMapName.text = LanguageManager.Instance.Text(bigMapConfig.mapName);
             Text_PlacesName.text = LanguageManager.Instance.Text(placesConfig.placeName);
-            int triggerCount = 0;
-            foreach (var i in placesConfig.MainTaskID)
-            {
-                if (EventSystemManager.Instance.IsEventTrigger(i))
-                {
-                    triggerCount++;
-                }
-            }
-
-            Text_PlacesComplteProgress.text = $"章节事件：{triggerCount}/{placesConfig.MainTaskID.Length}";
+            // int triggerCount = 0;
+            // foreach (var i in placesConfig.MainTaskID)
+            // {
+            //     if (EventSystemManager.Instance.IsEventTrigger(i))
+            //     {
+            //         triggerCount++;
+            //     }
+            // }
+
+            AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(placesConfig.ID);
+
+            Text_PlacesComplteProgress.text = $"章节事件：{placesData.progress}/{placesConfig.TotalScore}";
             return await base.AsyncInit(uiData);
         }
 
@@ -257,7 +259,7 @@ namespace Fort23.Mono
                 uiData: new object[] { placesId, callBack }, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var shopBtnWidget in _shopBtnWidgets)
             {
@@ -274,7 +276,7 @@ namespace Fort23.Mono
                 callBack = null;
             }
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -178,7 +178,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyGComponent(modelObj);
             modelObj = null;
@@ -195,7 +195,7 @@ namespace Fort23.Mono
             }
 
             HeroAttributeWidgets.Clear();
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -569,7 +569,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
             {
@@ -610,7 +610,7 @@ namespace Fort23.Mono
             selectedFaBaoInfo = null;
             SetSelectIcon(null);
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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

@@ -343,7 +343,7 @@ namespace Fort23.Mono
             return mainPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var shengShiConditionWidget in _shengShiConditionWidgets)
             {
@@ -357,7 +357,7 @@ namespace Fort23.Mono
             }
 
             widgets.Clear();
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiInfoPanel.cs

@@ -94,7 +94,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<QiankundaiInfoPanel>(null, UILayer.Top, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var widgetItem in items)
             {
@@ -103,7 +103,7 @@ namespace Fort23.Mono
 
             items.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiPanel.cs

@@ -109,7 +109,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<QiankundaiPanel>(null, UILayer.Top, isShowBG: true);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var widgetItem in items)
             {
@@ -118,7 +118,7 @@ namespace Fort23.Mono
 
             items.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/RewardsPanel/RewardsPanel.cs

@@ -37,7 +37,7 @@ namespace Fort23.Mono
             UIManager.Instance.HideUIUIPanel(this);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             onClose?.Invoke();
             foreach (var widgetItem in widgetItems)
@@ -46,7 +46,7 @@ namespace Fort23.Mono
             }
 
             widgetItems.Clear();
-            base.Close();
+            await base.Close();
         }
 
         private Action onClose;

Assets/Scripts/GameUI/UI/RewardsPanel/ShowItemNumberCom.cs

@@ -57,13 +57,13 @@ namespace Fort23.Mono
             });
         }
 
-        public override void Close()
+        public  override void  Close()
         {
             UIManager.Instance.DormancyGComponent(this);
             _timerEntity?.Dispose();
             _timerEntity = null;
 
-            base.Close();
+             base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -270,7 +270,7 @@ namespace Fort23.Mono
             await UIManager.Instance.LoadAndOpenPanel<SentimentInfoPanel>(null, uiData: new object[] { sentimentData });
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var sentimentEffectWidget in sentimentEffectWidgets)
             {
@@ -284,7 +284,7 @@ namespace Fort23.Mono
             // UIManager.Instance.DormancyGComponent(energyWidget);
             // energyWidget = null;
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs

@@ -119,7 +119,7 @@ namespace Fort23.Mono
         public override void Close()
         {
             CombatController.currActiveCombat.isUpdate = true;
-            base.Close();
+             base.Close();
         }
 
         public void CustomInit()

Assets/Scripts/GameUI/UI/ShopPanel/ShopBuyItemPanel.cs

@@ -2,6 +2,7 @@ using System;
 using Core.Language;
 using Core.Utility;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
 
@@ -216,9 +217,9 @@ namespace Fort23.Mono
             Text_Price.text = $"{(count * _shopItemConfig.price).ToString()}";
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
-            base.Close();
+            await base.Close();
             UIManager.Instance.DormancyAllGComponent<WidgetItem>(_poolName);
             _callback?.Invoke(_buyMark, currentSelectCount);
         }

Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -121,14 +121,14 @@ namespace Fort23.Mono
             return await base.AsyncInit(uiData);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             OneRoot.gameObject.SetActive(false);
             TenRoot.gameObject.SetActive(false);
             Text_Bl.gameObject.SetActive(false);
             Btn_ShuangBei.gameObject.SetActive(true);
 
-            base.Close();
+            await base.Close();
         }
 
         public async static CTask OpenPanel(List<ItemInfo> itemInfos, int type, int configId)

Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -162,7 +162,7 @@ namespace Fort23.Mono
         }
 
 
-        public override void Close()
+        public async override CTask Close()
         {
             foreach (var shopGroupWidgetType1 in _shopGroupWidgetType1s)
             {
@@ -192,7 +192,7 @@ namespace Fort23.Mono
             //     mainUIPanel.FindShop();
             // }
 
-            base.Close();
+            await base.Close();
         }
 
         public static async CTask<ShopPanel> OpenPanel(bool isPauseCombat = false)

Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -130,7 +130,7 @@ namespace Fort23.Mono
             return taskInfoPanel;
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             if (PlayerGuideManager.Instance.GuideIsCanDo(2, 7))
             {
@@ -144,7 +144,7 @@ namespace Fort23.Mono
 
             widgetItems.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/TipMessagePanel/TipMessagePanelType2.cs

@@ -119,11 +119,11 @@ namespace Fort23.Mono
             _timerEntity = TimerComponent.Instance.AddTimer(2000, () => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             _timerEntity?.Dispose();
             _timerEntity = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/TipsPanel/TipsPanle.cs

@@ -36,10 +36,10 @@ namespace Fort23.Mono
             });
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             _cTask = null;
-            base.Close();
+            await base.Close();
         }
 
         public void CustomInit(string title,string tips, CTask<bool> cTask,int showButCount)

Assets/Scripts/GameUI/UI/TowerPanel/TowerPanel.cs

@@ -192,12 +192,12 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyGComponent(widget as UIComponent);
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             _towerData = null;
             ulockId = 0;
             currentLevelWidget = null;
-            base.Close();
+            await base.Close();
         }
     }
 }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -250,7 +250,7 @@ namespace Fort23.Mono
             // }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             showXianTuLogInfoData.Clear();
             foreach (var uiComponent in components)
@@ -261,7 +261,7 @@ namespace Fort23.Mono
             components.Clear();
             // titleWidgets.Clear();
 
-            base.Close();
+            await base.Close();
         }
 
         List<UIComponent> _components = new List<UIComponent>();

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -497,7 +497,7 @@ namespace Fort23.Mono
             }
         }
 
-        public override void Close()
+        public async override CTask Close()
         {
             UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
             UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
@@ -525,7 +525,7 @@ namespace Fort23.Mono
             placesXaiXuan = 0;
             places.Clear();
 
-            base.Close();
+            await base.Close();
         }
     }
 }

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: -2054
+    y: 328
+    width: 892
+    height: 541
+  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}
@@ -20,11 +44,11 @@ MonoBehaviour:
     height: 1349
   m_ShowMode: 4
   m_Title: Inspector
-  m_RootView: {fileID: 4}
+  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,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 714
-    width: 1345
-    height: 585
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 15}
+    y: 0
+    width: 892
+    height: 541
+  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}
@@ -63,20 +87,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 11}
-  - {fileID: 2}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1345
-    height: 1299
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 2518
+    width: 892
+    height: 541
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 26326
   draggingID: 0
---- !u!114 &4
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -89,9 +112,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 5}
   - {fileID: 6}
   - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -104,7 +127,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &5
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -126,7 +149,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &6
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -139,22 +162,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
-  - {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: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 201
+  controlID: 601
   draggingID: 0
---- !u!114 &7
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -175,7 +198,7 @@ MonoBehaviour:
     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}
@@ -190,18 +213,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1345
+    x: 1209
     y: 0
-    width: 319
+    width: 411
     height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 12}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -216,18 +239,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1664
+    x: 1620
     y: 0
-    width: 265
+    width: 552
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -242,18 +265,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1929
+    x: 2172
     y: 0
-    width: 631
+    width: 388
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 13}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -270,16 +293,122 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1345
-    height: 714
+    width: 1209
+    height: 1299
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 19}
+  - {fileID: 18}
+  - {fileID: 14}
   m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &12
+  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: -2054
+    y: 328
+    width: 892
+    height: 520
+  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}
+  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: 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: 1
+  m_LayerEditor:
+    m_SelectedLayerIndex: 0
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -299,9 +428,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1345
+    x: 1209
     y: 73
-    width: 317
+    width: 409
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -316,25 +445,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 7a010100
-      m_LastClickedID: 0
-      m_ExpandedIDs: c4eff9ffcaeff9ff02e7ffff
+      m_SelectedIDs: 44f70100
+      m_LastClickedID: 128836
+      m_ExpandedIDs: bcbff0ffe2bff0ffb2f60100bcf60100c2f60100c4f60100e0f6010006f7010020f701002cf7010094f70100a0f70100a4f70100d0f70100e0f70100
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: SkillKongWidget
+        m_OriginalName: SkillKongWidget
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: 80122
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 4
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 8}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -342,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}
@@ -362,9 +491,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1929
+    x: 2172
     y: 73
-    width: 630
+    width: 387
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -379,7 +508,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 506
+    m_CachedPref: -160
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -389,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}
@@ -409,9 +538,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1664
+    x: 1620
     y: 73
-    width: 263
+    width: 550
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -434,7 +563,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/Environment/shan2/Models
+    - Assets/Res/UI/HeroInformainPanel
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -442,16 +571,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/Environment/shan2/Models
-  m_LastFoldersGridSize: -1
-  m_LastProjectPath: D:\unityProject\XiuXianGame
+  - Assets/Res/UI/HeroInformainPanel
+  m_LastFoldersGridSize: 16
+  m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: a88c0100
-    m_LastClickedID: 101544
-    m_ExpandedIDs: 0000000082f6000084f6000086f6000088f600008af600008cf600008ef6000090f6000092f6000094f6000096f6000098f600009af600009cf600009ef60000a0f60000a2f60000a4f60000a6f60000a8f60000aaf60000acf60000aef60000b0f60000b2f60000b4f60000b6f60000b8f60000baf60000bcf60000e0f60000faf60000c8f70000543d0100aa8c010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 262}
+    m_SelectedIDs: e8c80000
+    m_LastClickedID: 51432
+    m_ExpandedIDs: 00000000eec50000f0c50000f2c50000f4c50000f6c50000f8c50000fac50000fcc50000fec5000000c6000002c6000004c6000014c9000090e5000092e5000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -479,7 +608,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000082f6000084f6000086f6000088f600008af600008cf600008ef6000090f6000092f6000094f6000096f6000098f600009af600009cf600009ef60000a0f60000a2f60000a4f60000a6f60000a8f60000aaf60000acf60000aef60000b0f60000b2f60000b4f60000b6f60000b8f60000baf60000bcf60000
+    m_ExpandedIDs: 00000000eec50000f0c50000f2c50000f4c50000f6c50000f8c50000fac50000fcc50000fec5000000c6000002c6000004c60000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -507,23 +636,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 74530100928c0100a28c0100
+    m_ExpandedInstanceIDs: f0920200
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: CombatHero
-      m_OriginalName: CombatHero
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 63624
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 9}
+      m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -534,8 +663,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 50
---- !u!114 &15
+  m_DirectoriesAreaWidth: 205
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -556,9 +685,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 787
-    width: 1344
-    height: 564
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -584,7 +713,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -602,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
@@ -611,29 +740,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1344
-      height: 543
-    m_Scale: {x: 0.33435962, y: 0.33435962}
-    m_Translation: {x: 672, y: 271.5}
+      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: -2009.8121
+      x: -780.34686
       y: -812
-      width: 4019.6243
+      width: 1560.6937
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.33435962
-  m_LastWindowPixelSize: {x: 1344, y: 564}
+  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}
@@ -655,8 +784,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 1344
-    height: 693
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -671,7 +800,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -179, y: -26}
+      snapOffset: {x: -179, y: -1}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -711,7 +840,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -723,7 +852,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -763,7 +892,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -789,7 +918,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -802,7 +931,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -854,7 +983,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -867,7 +996,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -880,7 +1009,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -892,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
@@ -1017,20 +1146,33 @@ 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
-  m_OverrideSceneCullingMask: 6917529027641081856
-  m_SceneIsLit: 1
+  m_OverrideSceneCullingMask: 0
+  m_SceneIsLit: 0
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -586.4138, y: 8.904787, z: 89.44743}
+    m_Target: {x: 176.51308, y: 859.678, z: -11.139789}
     speed: 2
-    m_Value: {x: -586.4138, y: 8.904787, z: 89.44743}
+    m_Value: {x: 295.6988, y: 576.83453, z: -4.7244225}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1041,7 +1183,7 @@ MonoBehaviour:
   m_SceneViewState:
     m_AlwaysRefresh: 0
     showFog: 1
-    showSkybox: 1
+    showSkybox: 0
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -1058,17 +1200,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 1
+        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}
     zGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       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}
@@ -1076,17 +1218,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.20330225, y: 0.5740255, z: -0.14982404, w: -0.77892035}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: -0.20213352, y: 0.57424927, z: -0.14896274, w: -0.779224}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 18.497053
+    m_Target: 1114.8466
     speed: 2
-    m_Value: 18.542759
+    m_Value: 800.2221
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5