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

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by master version

Assets/Art/Dujie/predujie.playable

@@ -1,5 +1,28 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-9174596349028513306
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 11500000, guid: 48853ae485fa386428341ac1ea122570, type: 3}
+  m_Name: ControlPlayableAsset(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 255281cd94c19e94baf8ee339778948d
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 0}
+  updateParticle: 1
+  particleRandomSeed: 7985
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 1
+  active: 1
+  postPlayback: 2
 --- !u!114 &-8392393903099103772
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -394,6 +417,7 @@ MonoBehaviour:
   - {fileID: -8392393903099103772}
   - {fileID: 7597280952754388909}
   - {fileID: -4133211833681818352}
+  - {fileID: 4715551344722035080}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
@@ -423,6 +447,98 @@ MonoBehaviour:
   searchHierarchy: 1
   active: 1
   postPlayback: 2
+--- !u!114 &4715551344722035080
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track (2)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 2.25
+    m_ClipIn: 0
+    m_Asset: {fileID: -9174596349028513306}
+    m_Duration: 5
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 4715551344722035080}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: fx_ui_dujie_sd
+  m_Markers:
+    m_Objects: []
 --- !u!114 &6656762707459004628
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -538,7 +654,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 2
+    m_Start: 1.3
     m_ClipIn: 0
     m_Asset: {fileID: 2771148085318837006}
     m_Duration: 5

Assets/Art/Environment/cj01.prefab

@@ -63,7 +63,6 @@ MeshRenderer:
   m_virtualGeometry: 0
   m_virtualGeometryShadow: 0
   m_ShadingRate: 0
-  m_ForceDisableGRD: 0
   m_RenderingLayerMask: 4294967295
   m_RendererPriority: 0
   m_Materials:
@@ -185,7 +184,6 @@ MeshRenderer:
   m_virtualGeometry: 0
   m_virtualGeometryShadow: 0
   m_ShadingRate: 0
-  m_ForceDisableGRD: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -273,7 +271,6 @@ MeshRenderer:
   m_virtualGeometry: 0
   m_virtualGeometryShadow: 0
   m_ShadingRate: 0
-  m_ForceDisableGRD: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -394,7 +391,6 @@ MeshRenderer:
   m_virtualGeometry: 0
   m_virtualGeometryShadow: 0
   m_ShadingRate: 0
-  m_ForceDisableGRD: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -482,7 +478,6 @@ MeshRenderer:
   m_virtualGeometry: 0
   m_virtualGeometryShadow: 0
   m_ShadingRate: 0
-  m_ForceDisableGRD: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -570,7 +565,6 @@ MeshRenderer:
   m_virtualGeometry: 0
   m_virtualGeometryShadow: 0
   m_ShadingRate: 0
-  m_ForceDisableGRD: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -650,7 +644,6 @@ MeshRenderer:
   m_virtualGeometry: 0
   m_virtualGeometryShadow: 0
   m_ShadingRate: 0
-  m_ForceDisableGRD: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -746,7 +739,6 @@ MeshRenderer:
   m_virtualGeometry: 0
   m_virtualGeometryShadow: 0
   m_ShadingRate: 0
-  m_ForceDisableGRD: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -843,7 +835,6 @@ MeshRenderer:
   m_virtualGeometry: 0
   m_virtualGeometryShadow: 0
   m_ShadingRate: 0
-  m_ForceDisableGRD: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:

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

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

Assets/Res/Config/EventConfig.json

@@ -6382,7 +6382,7 @@
         3
       ],
       "EventValue": [
-        30023,
+        9141,
         101
       ],
       "EventName": 4277,

Assets/Res/Config/SentimentEffectConfig.json

@@ -127,8 +127,8 @@
       "icon": "icon",
       "massge": 3141,
       "pos": 1,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         2
@@ -144,8 +144,8 @@
       "icon": "icon",
       "massge": 10520,
       "pos": 1,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         3
@@ -161,8 +161,8 @@
       "icon": "icon",
       "massge": 10521,
       "pos": 1,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         4
@@ -178,8 +178,8 @@
       "icon": "icon",
       "massge": 10522,
       "pos": 1,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         5
@@ -195,8 +195,8 @@
       "icon": "icon",
       "massge": 10523,
       "pos": 1,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         6
@@ -297,8 +297,8 @@
       "icon": "icon",
       "massge": 3143,
       "pos": 3,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 7,
       "effectVale": [
         2
@@ -314,8 +314,8 @@
       "icon": "icon",
       "massge": 10528,
       "pos": 3,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 7,
       "effectVale": [
         3
@@ -331,8 +331,8 @@
       "icon": "icon",
       "massge": 10529,
       "pos": 3,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 7,
       "effectVale": [
         4
@@ -348,8 +348,8 @@
       "icon": "icon",
       "massge": 10530,
       "pos": 3,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 7,
       "effectVale": [
         5
@@ -365,8 +365,8 @@
       "icon": "icon",
       "massge": 10531,
       "pos": 3,
-      "lastSentimentEffectId": -1,
-      "unlockLevel": 0,
+      "lastSentimentEffectId": 1,
+      "unlockLevel": 1,
       "effectType": 7,
       "effectVale": [
         6

Assets/Scripts/GameData/ExcelConfig/SentimentEffectConfig.cs

@@ -85,7 +85,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///前置条件 （-1是主属性）
+		///前置条件 （1是主属性）
 		/// </summary>
 #if !COMBAT_SERVER
 		public int lastSentimentEffectId;

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -39,61 +39,9 @@ namespace GameLogic.Bag
             }
         }
 
-        #region 快速添加和扣除常用道具
 
-        /// <summary>
-        /// 加金币
-        /// </summary>
-        /// <param name="count"></param>
-        public void AddCoin(long count)
-        {
-            AddItem(GlobalParam.Item_Coin_ID, count);
-        }
 
-        /// <summary>
-        /// 扣金币
-        /// </summary>
-        /// <param name="count"></param>
-        public bool DeductCoin(long count)
-        {
-            return DeductItem(GlobalParam.Item_Coin_ID, count);
-        }
-
-        /// <summary>
-        /// 加钻石
-        /// </summary>
-        /// <param name="count"></param>
-        public void AddDiamond(long count)
-        {
-            AddItem(GlobalParam.Item_Diamond_ID, count);
-        }
 
-        /// <summary>
-        /// 扣钻石
-        /// </summary>
-        /// <param name="count"></param>
-        public bool DeductDiamond(long count)
-        {
-            return DeductItem(GlobalParam.Item_Diamond_ID, count);
-        }
-
-        /// <summary>
-        /// 加英雄经验
-        /// </summary>
-        /// <param name="count"></param>
-        public void AddHeroExp(long count)
-        {
-            AddItem(GlobalParam.Item_HeroExp_ID, count);
-        }
-
-        /// <summary>
-        /// 扣英雄经验
-        /// </summary>
-        /// <param name="count"></param>
-        public bool DuctHeroExp(long count)
-        {
-            return DeductItem(GlobalParam.Item_HeroExp_ID, count);
-        }
 
 
         /// <summary>
@@ -131,7 +79,6 @@ namespace GameLogic.Bag
             return IsEnough(item, count);
         }
 
-        #endregion
 
         public bool AddItem(int itemId, long count, string guid = "")
         {
@@ -195,10 +142,12 @@ namespace GameLogic.Bag
                 if (faaData != null)
                 {
                     // item.isSuiPian = true;
+                    //TODO 转碎片
                     return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2] * count);
                 }
                 else
                 {
+                    //TODO 完全体
                     faaData = new AccountFileInfo.FaBaoData();
                     faaData.id = item.config.associateVlaue[1];
                     faaData.level = 1;
@@ -218,10 +167,12 @@ namespace GameLogic.Bag
                 if (skillData != null)
                 {
                     // item.isSuiPian = true;
+                    //TODO 转碎片
                     return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2] * count);
                 }
                 else
                 {
+                    //TODO 完全体
                     skillData = new AccountFileInfo.SkillData();
                     skillData.id = item.config.associateVlaue[1];
                     skillData.star = 1;
@@ -243,6 +194,7 @@ namespace GameLogic.Bag
             }
             else if (item.config.itemTag == 9)
             {
+                //TODO 代金卷需要二次计算数量
                 return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
             }
             else if (item.config.itemTag == 28)
@@ -270,6 +222,7 @@ namespace GameLogic.Bag
             {
                 if (item.count >= item.config.associateVlaue[0])
                 {
+                    //TODO 合成广告卡
                     AddItem(item.config.associateVlaue[1], 1);
                 }
             }

Assets/Scripts/GameLogic/Combat/Buff/BuffBasic.cs

@@ -263,6 +263,11 @@ namespace GameLogic.Combat.Buff
 
         public void DelectBuff()
         {
+            if (combatHeroEntity == null || combatHeroEntity.BuffControl == null)
+            {
+                return;
+            }
+
             combatHeroEntity.BuffControl.RemoveBuff(this);
         }
 
@@ -276,7 +281,6 @@ namespace GameLogic.Combat.Buff
                 combatHeroEntity.BuffControl.RemoveBuff(this);
                 return;
             }
-           
 
 
             UpdateEffect();

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

@@ -466,10 +466,9 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         }
         heroMagicWeaponControl?.Dispose();
         _isDis = true;
-        BuffControl.Dispose();
-        _isDis = true;
 
         CombatHeroSkillControl.Dispose();
+        BuffControl.Dispose();
         CombatAIBasic.Dispose();
         combatHeroTimeLineControl.Dispose();
         combatHeroAnimtion.Dispose();
@@ -487,11 +486,11 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         }
         heroMagicWeaponControl?.Dispose();
         _isDis = true;
-        BuffControl.Dispose();
+       
         combatHeroGameObject.Dispose();
         isDie = true;
         CombatHeroSkillControl.Dispose();
-
+        BuffControl.Dispose();
         CombatAIBasic.Dispose();
         combatHeroTimeLineControl.Dispose();
         combatHeroAnimtion.Dispose();
@@ -503,7 +502,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
     private void ProDormancyObj()
     {
-        CombatHeroSkillControl.ProDormancyObj();
+        CombatHeroSkillControl?.ProDormancyObj();
     }
 
     public override void ActiveObj()

Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -109,6 +109,7 @@ namespace GameLogic.Player
                         if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
                                 openBoxConfig.oneConsume) || openBoxConfig.CostItemID == 1007)
                         {
+                            //TODO 消耗：抽功法 (count 1/10)
                             PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,
                                 openBoxConfig.oneConsume);
                         }
@@ -179,6 +180,7 @@ namespace GameLogic.Player
                         if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
                                 openBoxConfig.tenConsume) || openBoxConfig.CostItemID == 1007)
                         {
+                            //TODO 消耗：抽功法 (count = 1 / 10)
                             PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,
                                 openBoxConfig.tenConsume);
                         }
@@ -250,7 +252,7 @@ namespace GameLogic.Player
                 // 检查是否触发保底2重置
                 CheckBaodi2Reset(summonData, normalItems, baodiItemSet);
             }
-
+//TODO 抽卡：通过openBoxConfig判断来源
             PlayerManager.Instance.BagController.AddItem(allItem);
 
 

Assets/Scripts/GameLogic/SDK/DBManager.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using GameLogic.Bag;
 using UnityEngine;
 using Utility;
 
@@ -27,5 +28,18 @@ public class DBManager : Singleton<DBManager>
     {
         
     }
+
+    public void GetItems(string source, List<ItemInfo> items)
+    {
+        Dictionary<string, object> properties = null;
+        CustomEvent("#get_items", properties);
+    }
+
+    public void CostItems(string source, List<ItemInfo> items)
+    {
+        Dictionary<string, object> properties = null;
+        CustomEvent("#cost_items", properties);
+        
+    }
     
 }

Assets/Scripts/GameLogic/Shop/ShopManger.cs

@@ -317,6 +317,7 @@ public class ShopManger : Singleton<ShopManger>
         }
         else
         {
+            //TODO 消耗：商店购买 (ps:可能是其他UI直购，比如神识丹，暂时可以忽略）
             if (PlayerManager.Instance.BagController.DeductItem(shopItemConfig.costItemId,
                     shopItemConfig.price * count))
             {
@@ -334,7 +335,7 @@ public class ShopManger : Singleton<ShopManger>
 
                 itemList.Add(itemInfo);
             }
-
+//TODO 抽卡：商店购买
             PlayerManager.Instance.BagController.AddItem(itemList);
             //更新商店数据
             AccountFileInfo.Instance.SavePlayerData();

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -276,6 +276,7 @@ public class DialogueManager : Singleton<DialogueManager>
             case 4:
                 for (var i = 0; i < dialogueConfig.optionPara1.Length; i++)
                 {
+                    //TODO 消耗：事件需求
                     PlayerManager.Instance.BagController.DeductItem(dialogueConfig.optionPara1[i],
                         dialogueConfig.optionPara2[i]);
                 }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -510,11 +510,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             if (itemInfoType1 != null)
             {
+                //TODO 消耗：神识符（概率）
                 PlayerManager.Instance.BagController.DeductItem(itemInfoType1.itemID, 1);
             }
 
             if (itemInfoType2 != null)
             {
+                //TODO 消耗：神识符箓（特定资源）
                 PlayerManager.Instance.BagController.DeductItem(itemInfoType2.itemID, 1);
             }
 
@@ -1312,7 +1314,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             itemInfos.Add(new ItemInfo(eventListItemInfo));
         }
 
-
+//TODO 完成事件 (eventConfig)
         PlayerManager.Instance.BagController.AddItem(itemInfos);
 
 

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

@@ -107,6 +107,7 @@ namespace Fort23.Mono
 
                 if (PlayerGuideManager.Instance.curPhase == 8 && openBoxConfig.ID == 2)
                 {
+                    //TODO 消耗：不记引导
                     PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID, openBoxConfig.oneConsume);
 
                     var item = DropManager.Instance.DropItem(999011);

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

@@ -98,7 +98,9 @@ namespace Fort23.Mono
                 foreach (var itemInfo in itemInfos)
                 {
                     ItemInfo itemInfo1 = new ItemInfo(itemInfo.itemID, (long)(itemInfo.count.Value * (beLv - 1)));
+                    //TODO 功法双倍奖励
                     PlayerManager.Instance.BagController.AddItem(itemInfo1);
+                    
                 }
 
                 if (itemInfos.Count == 1)

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

@@ -165,7 +165,7 @@ namespace Fort23.Mono
                 {
                     summonSocreData.currentCount = 0;
                 }
-
+                //TODO 200抽挑战后
                 PlayerManager.Instance.BagController.AddItem(itemInfos);
                 AccountFileInfo.Instance.SavePlayerData();
                 RewardsPanel.OpenPanel(itemInfos);

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

@@ -229,6 +229,12 @@ namespace Fort23.Mono
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkillFinish, UseSkillFinish);
         }
 
+        public override void DestroyObj()
+        {
+            StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
+            base.DestroyObj();
+        }
+
         private async void UseSkillFinish(IEventData ieveData)
         {
             UseSkillFinishEventData eventData = ieveData as UseSkillFinishEventData;

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

@@ -143,6 +143,7 @@ namespace Fort23.Mono
                 //加好感
                 if (widgetItem1 != null && daoyouGiftConfig.ID != 0)
                 {
+                    //TODO 消耗：送礼给道友
                     PlayerManager.Instance.BagController.DeductItem(daoyouGiftConfig.ItemID, count);
 
 
@@ -198,7 +199,7 @@ namespace Fort23.Mono
                         TipMessagePanel.OpenTipMessagePanel("心情已经到最高");
                         return;
                     }
-
+                    //TODO 消耗：送礼给道友
                     PlayerManager.Instance.BagController.DeductItem(widgetItem1.itemInfo.itemID, count);
                     daoYouData.emotionValue += widgetItem1.itemInfo.config.associateVlaue[0];
 

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

@@ -52,6 +52,7 @@ namespace Fort23.Mono
                 daoYouData.awardLevels.Add(_daoyouLevelupConfig.ID);
                 if (items.Count > 0)
                 {
+                    //TODO 道友好感度 
                     PlayerManager.Instance.BagController.AddItem(items);
                     RewardsPanel.OpenPanel(items);
                 }

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

@@ -64,6 +64,7 @@ namespace Fort23.Mono
                                 AccountFileInfo.Instance.playerData.divineSensePoint +=
                                     itemInfo.config.associateVlaue[0];
                                 EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
+                                //TODO 消耗：神识丹（代金卷直购）
                                 PlayerManager.Instance.BagController.DeductItem(itemInfo.config.ID, 1);
                             }
                         }
@@ -78,7 +79,7 @@ namespace Fort23.Mono
                         TipMessagePanel.OpenTipMessagePanel(833, Vector2.zero);
                     }
                 }
-                //世界使用道具
+                //直接使用道具
                 else
                 {
                     if (PlayerManager.Instance.BagController.IsEnough(itemConfig.ID, 1))
@@ -86,6 +87,7 @@ namespace Fort23.Mono
                         AudioManager.Instance.PlayAudio("ui_tycg.wav");
                         AccountFileInfo.Instance.playerData.divineSensePoint +=
                             itemConfig.associateVlaue[0];
+                        //TODO 消耗：神识丹（自有道具）
                         PlayerManager.Instance.BagController.DeductItem(itemConfig.ID, 1);
                         EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
                         UIManager.Instance.GetComponent<DivineSenceRestoredPanel>().CreatWidget();

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

@@ -161,6 +161,7 @@ namespace Fort23.Mono
                 CustomInit(_skillInfo);
                 foreach (var keyValuePair in itemInfo)
                 {
+                    //TODO 功法重置
                     PlayerManager.Instance.BagController.AddItem(keyValuePair.Value);
                 }
 
@@ -194,7 +195,8 @@ namespace Fort23.Mono
             SkillConstant skillConstant = ConfigComponent.Instance.Get<SkillConstant>(itemConfig.quality);
 
             int count = skillConstant.SkillPromoteNeedPieceNum[_skillInfo.skillConfig.level - 1];
-
+            
+            //TODO 消耗：功法升星
             if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.skillConfig.PieceID, count))
             {
                 AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
@@ -269,6 +271,7 @@ namespace Fort23.Mono
             //扣除道具
             for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
             {
+                //TODO 消耗：功法升级
                 PlayerManager.Instance.BagController.DeductItem(_skillInfo.SkillPowerupConfig.LevelupItem[i],
                     _skillInfo.SkillPowerupConfig.LevelupItemNum[i]);
             }

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

@@ -703,6 +703,7 @@ namespace Fort23.Mono
             {
                 for (var i = 0; i < guideConfig.AwardItem.Length; i++)
                 {
+                    //TODO 不记录引导赠送
                     PlayerManager.Instance.BagController.AddItem(new ItemInfo(guideConfig.AwardItem[i],
                         guideConfig.AwardItemNum[i]));
                 }

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

@@ -117,6 +117,7 @@ namespace Fort23.Mono
 
                     for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs?.Length; i++)
                     {
+                        //TODO 消耗：突破境界（可选道具）
                         PlayerManager.Instance.BagController.DeductItem(
                             PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1);
                     }
@@ -135,6 +136,7 @@ namespace Fort23.Mono
                              i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
                              i++)
                         {
+                            //TODO 消耗：突破境界（必选道具）
                             PlayerManager.Instance.BagController.DeductItem(
                                 PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1);
                         }

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

@@ -67,6 +67,7 @@ namespace Fort23.Mono
                 return;
             }
 
+            //TODO 消耗：修为丹
             if (PlayerManager.Instance.BagController.DeductItem(elixirItemWidget.ItemConfig.ID, 1))
             {
                 // PlayerManager.Instance.myHero.heroData.exp += elixirItemWidget.ItemConfig.associateVlaue[0];

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

@@ -161,6 +161,7 @@ namespace Fort23.Mono
                 }
                 foreach (var keyValuePair in itemInfo)
                 {
+                    //TODO 法宝重置
                     PlayerManager.Instance.BagController.AddItem(keyValuePair.Value);
                 }
                 RewardsPanel.OpenPanel(itemInfo);
@@ -232,6 +233,7 @@ namespace Fort23.Mono
 
                 for (var i = 0; i < selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
                 {
+                    //TODO 消耗：法宝升级
                     PlayerManager.Instance.BagController.DeductItem(
                         selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i],
                         selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]);
@@ -240,6 +242,7 @@ namespace Fort23.Mono
                 if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum != null &&
                     selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1] != -1)
                 {
+                    //TODO 消耗：法宝突破
                     PlayerManager.Instance.BagController.DeductItem(itemConfig.associateVlaue[0],
                         selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]);
                 }

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

@@ -36,6 +36,7 @@ namespace Fort23.Mono
                 foreach (var playerDataQiankundaiItemData in AccountFileInfo.Instance.playerData.QiankundaiItemDatas)
                 {
                     ItemInfo itemInfo = new ItemInfo(playerDataQiankundaiItemData);
+                    //TODO 挂机
                     PlayerManager.Instance.BagController.AddItem(itemInfo);
                     itemInfos.Add(itemInfo);
                 }
@@ -52,6 +53,7 @@ namespace Fort23.Mono
                                 qiankundaiConfig.DropCount[i]);
                             foreach (var info in itemInfo)
                             {
+                                //TODO 挂机（一日一次的）
                                 PlayerManager.Instance.BagController.AddItem(info);
                                 itemInfos.Add(info);
                             }

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

@@ -119,6 +119,7 @@ namespace Fort23.Mono
                 SentimentEffectConfig sentimentEffectConfig =
                     ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
 
+                //TODO 消耗：心境点
                 if (!PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId,
                         sentimentEffectConfig.upConstCount))
                 {

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

@@ -90,6 +90,7 @@ namespace Fort23.Mono
                 {
                     ItemInfo itemInfo1 = new ItemInfo(itemInfo.itemID,
                         (long)(itemInfo.config.associateVlaue[1] * (beLv - 1)));
+                    //TODO 代金卷双倍
                     PlayerManager.Instance.BagController.AddItem(itemInfo1);
                 }
 

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

@@ -45,6 +45,7 @@ namespace Fort23.Mono
                 for (var i = 0; i < _towerInfoConfig.reward.Length; i++)
                 {
                     ItemInfo itemInfo = new ItemInfo(_towerInfoConfig.reward[i], _towerInfoConfig.rewardCount[i]);
+                    //TODO 命运峰 
                     PlayerManager.Instance.BagController.AddItem(itemInfo);
                     itemInfos.Add(itemInfo);
                 }

UserSettings/EditorUserSettings.asset

@@ -42,13 +42,13 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5a52520506055c0b5c5e082740725b4413161b7d7f7c7761297b1c67bbb26168
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

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: 2911
+    y: 502
+    width: 892
+    height: 537
+  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,63 @@ MonoBehaviour:
     width: 2560
     height: 1357
   m_ShowMode: 4
-  m_Title: Hierarchy
-  m_RootView: {fileID: 2}
+  m_Title: Game
+  m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 492}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &2
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 892
+    height: 537
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
+  m_Panes:
+  - {fileID: 15}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 3}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 892
+    height: 537
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 372
+  draggingID: 0
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -37,9 +112,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
-  - {fileID: 4}
-  - {fileID: 5}
+  - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -52,7 +127,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -74,7 +149,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &4
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,10 +162,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 7}
-  - {fileID: 8}
   - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
+  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -102,7 +177,7 @@ MonoBehaviour:
   vertical: 0
   controlID: 180
   draggingID: 0
---- !u!114 &5
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -123,7 +198,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &6
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -136,8 +211,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 10}
-  - {fileID: 11}
+  - {fileID: 13}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -149,7 +224,7 @@ MonoBehaviour:
   vertical: 1
   controlID: 29
   draggingID: 0
---- !u!114 &7
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -168,14 +243,14 @@ MonoBehaviour:
     y: 0
     width: 367
     height: 1307
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 12}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -196,12 +271,12 @@ MonoBehaviour:
     height: 1307
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -222,12 +297,12 @@ MonoBehaviour:
     height: 1307
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -246,14 +321,14 @@ MonoBehaviour:
     y: 0
     width: 1209
     height: 308
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -274,12 +349,46 @@ MonoBehaviour:
     height: 999
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &15
+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: 2911
+    y: 502
+    width: 892
+    height: 516
+  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 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -318,7 +427,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 5efaffff
+      m_ExpandedIDs: b8faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -334,7 +443,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 7}
+        m_ClientGUIView: {fileID: 10}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -342,7 +451,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: aaf4eaa9bcd57ea468179db2b9e4fb70
---- !u!114 &13
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -389,7 +498,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &14
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -424,7 +533,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: LogT
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -434,24 +543,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI/UI/MainPanel
+    - Assets/Scripts/Core/Log
     m_Globs: []
-    m_OriginalText: LogT
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI/UI/MainPanel
+  - Assets/Scripts/Core/Log
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\Server\NetServer\NetServer\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 1615}
-    m_SelectedIDs: 06cb0000
-    m_LastClickedID: 51974
-    m_ExpandedIDs: 0000000024a800001eca000020ca000022ca000024ca000026ca000028ca00002aca00002cca00002eca000030ca000032ca000034ca000036ca000038ca00003aca00003cca00003eca000040ca000042ca000044ca000046ca000048ca00004aca00004cca000088ca000008cb00000acb000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 366}
+    m_SelectedIDs: 26cb0000
+    m_LastClickedID: 52006
+    m_ExpandedIDs: 0000000016a8000010ca000012ca000014ca000016ca000018ca00001aca00001cca00001eca000020ca000022ca000024ca000026ca000028ca00002aca00002cca00002eca000030ca000032ca000034ca000036ca000038ca00003aca00003cca00003eca00007aca0000faca0000fcca000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -479,7 +588,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000024a800001eca000020ca000022ca000024ca000026ca000028ca00002aca00002cca00002eca000030ca000032ca000034ca000036ca000038ca00003aca00003cca00003eca000040ca000042ca000044ca000046ca000048ca00004aca00004cca0000
+    m_ExpandedIDs: 0000000016a8000010ca000012ca000014ca000016ca000018ca00001aca00001cca00001eca000020ca000022ca000024ca000026ca000028ca00002aca00002cca00002eca000030ca000032ca000034ca000036ca000038ca00003aca00003cca00003eca0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -506,7 +615,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -523,7 +632,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 11}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -535,7 +644,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 175
---- !u!114 &15
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -633,7 +742,7 @@ MonoBehaviour:
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &16
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}