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

Assets/Art/HeroTimeLine/gf_1501_timeline.playable

@@ -22,7 +22,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.11606922745704651
+    m_Start: 0.3999999999999999
     m_ClipIn: 0
     m_Asset: {fileID: -644044793812257047}
     m_Duration: 1.001156462585034
@@ -120,19 +120,19 @@ MonoBehaviour:
   active: 1
   postPlayback: 2
   targetType: 2
-  LocationType: 0
-  targetSpecialDotName: 
+  LocationType: 5
+  targetSpecialDotName: zdpos1
   randomGroup: 0
   isUseRandom: 1
   xoff:
-    x: -1
-    y: 1
+    x: 1.5
+    y: -1.5
   yoff:
-    x: 0
-    y: 1
+    x: 1.5
+    y: -1.5
   zoff:
-    x: 0
-    y: 1
+    x: 0.5
+    y: -0.5
   hitPointGroupName: zdpos1
   isGround: 0
   isFollowTarget: 0
@@ -141,7 +141,7 @@ MonoBehaviour:
   isAttSpeed: 0
   isLoop: 0
   loopAlone: 0
-  isActivityCustomTargetPos: 1
+  isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
   isRoat: 0
@@ -209,7 +209,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
   m_Name: TimeLinePlayEntityAnimtionAsset(Clone)(Clone)(Clone)(Clone)
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
+  m_Clip: {fileID: 1827226128182048838, guid: 298173b205ae514408dd8f455d360fa5, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -243,10 +243,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.1
+    m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 4036464651189746888}
-    m_Duration: 2
+    m_Duration: 1
     m_TimeScale: 1
     m_ParentTrack: {fileID: -1223227800801429518}
     m_EaseInDuration: 0
@@ -310,7 +310,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: fx_gf_lieyanjian_qy
+    m_DisplayName: fx_gf_tu_tuci_chuxian
   m_Markers:
     m_Objects: []
 --- !u!114 &-894447145330074657
@@ -469,19 +469,19 @@ MonoBehaviour:
   active: 1
   postPlayback: 2
   targetType: 1
-  LocationType: 2
-  targetSpecialDotName: 
+  LocationType: 5
+  targetSpecialDotName: zdpos1
   randomGroup: 0
-  isUseRandom: 0
+  isUseRandom: 1
   xoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   yoff:
-    x: 0
-    y: 0
+    x: 1.5
+    y: -1.5
   zoff:
-    x: 0
-    y: 0
+    x: 0.5
+    y: -0.5
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -688,7 +688,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: attack1
+    m_DisplayName: attack3
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0

Assets/Art/VFX/FXPrefabs/fx gf 1502 sf dg.prefab

@@ -4868,7 +4868,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14679,7 +14679,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -19675,7 +19675,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7426109961001245997}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -29365,7 +29365,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -44167,7 +44167,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx gf 1502 sf1.prefab

@@ -9835,7 +9835,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14804,7 +14804,7 @@ Transform:
   - {fileID: 3937134812622481422}
   - {fileID: 3653628833004868731}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &3799091954986678673
 ParticleSystem:
   m_ObjectHideFlags: 0
@@ -24473,7 +24473,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1502.prefab

@@ -19572,7 +19572,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0

Assets/Art/VFX/FXPrefabs/fx_gf_duzhen_hit.prefab

@@ -10095,7 +10095,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 6
+      scalar: 3.93
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -24781,7 +24781,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 3.06
+      scalar: 2.4
       minScalar: 1
       maxCurve:
         serializedVersion: 2

Assets/Art/VFX/FXPrefabs/fx_gf_lieyanjian.prefab

@@ -4801,7 +4801,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -9693,7 +9693,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -14527,7 +14527,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -19494,7 +19494,9 @@ MonoBehaviour:
   delayTime: 0.3
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_lieyanjian_hit
+  startAudioName: 
   hitAudioName: 
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -19618,7 +19620,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.25
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -24549,7 +24551,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 5
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -34298,7 +34300,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

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.5842372
+    - _Alpha: 0.49184418
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

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

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

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.48192543
+    - _Alpha: 0.22744322
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: -0.08704239
+    - _MainTexOffsetU: 0.17958128
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Editor/HierarchyToggleEditor.cs

@@ -0,0 +1,56 @@
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+
+[InitializeOnLoad]
+public class HierarchyToggleEditor
+{
+    static HierarchyToggleEditor()
+    {
+        // 注册 Hierarchy 窗口的绘制回调
+        EditorApplication.hierarchyWindowItemOnGUI += OnHierarchyWindowItemGUI;
+    }
+
+    private static void OnHierarchyWindowItemGUI(int instanceID, Rect selectionRect)
+    {
+        // 获取当前绘制的 GameObject
+        GameObject obj = EditorUtility.InstanceIDToObject(instanceID) as GameObject;
+        if (obj == null) return;
+
+        // 设置绘制区域（Hierarchy 左侧）
+        Rect toggleRect = new Rect(selectionRect);
+        toggleRect.x = 28; // 放置在左侧，靠近树状结构图标后方
+        toggleRect.width = 20; // 按钮宽度
+        toggleRect.height = EditorGUIUtility.singleLineHeight;
+
+        // 自定义按钮样式
+        GUIStyle toggleButtonStyle = new GUIStyle(GUI.skin.button) { fontSize = 10 };
+
+        // 绘制启用/禁用按钮
+        bool isActive = obj.activeSelf;
+        if (GUI.Button(toggleRect, isActive ? "✔" : "✘", toggleButtonStyle))
+        {
+            // 记录 Undo 操作
+            Undo.RecordObject(obj, isActive ? "Disable GameObject" : "Enable GameObject");
+            obj.SetActive(!isActive);
+            MarkDirty(obj);
+            Debug.Log($"{(isActive ? "Disabled" : "Enabled")} GameObject {obj.name}");
+        }
+    }
+
+    // 标记对象为脏，确保修改保存
+    private static void MarkDirty(GameObject obj)
+    {
+        EditorUtility.SetDirty(obj);
+        // 如果在预制件编辑模式中，保存预制件
+        if (PrefabStageUtility.GetCurrentPrefabStage() != null)
+        {
+            var prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
+            if (prefabStage.prefabContentsRoot == obj || obj.transform.IsChildOf(prefabStage.prefabContentsRoot.transform))
+            {
+                PrefabUtility.SavePrefabAsset(prefabStage.prefabContentsRoot);
+                Debug.Log($"Saved prefab changes for {prefabStage.prefabContentsRoot.name}");
+            }
+        }
+    }
+}

Assets/Editor/HierarchyToggleEditor.cs.meta

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

Assets/Editor/ParticleSystemHierarchyEditor.cs

@@ -0,0 +1,93 @@
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+
+[InitializeOnLoad]
+public class ParticleSystemHierarchyEditor
+{
+    static ParticleSystemHierarchyEditor()
+    {
+        // 注册 Hierarchy 窗口的绘制回调
+        EditorApplication.hierarchyWindowItemOnGUI += OnHierarchyWindowItemGUI;
+    }
+
+    private static void OnHierarchyWindowItemGUI(int instanceID, Rect selectionRect)
+    {
+        // 获取当前绘制的 GameObject
+        GameObject obj = EditorUtility.InstanceIDToObject(instanceID) as GameObject;
+        if (obj == null) return;
+
+        // 检查是否包含 ParticleSystem 和 ParticleSystemRenderer
+        ParticleSystem particleSystem = obj.GetComponent<ParticleSystem>();
+        ParticleSystemRenderer particleRenderer = obj.GetComponent<ParticleSystemRenderer>();
+        if (particleSystem == null || particleRenderer == null) return;
+
+        // 设置绘制区域（Hierarchy 右侧）
+        Rect rect = new Rect(selectionRect);
+        rect.x += rect.width - 150; // 调整位置，留出空间显示控件
+        rect.height = EditorGUIUtility.singleLineHeight;
+
+        // 显示当前 Sorting Layer 名称（只读）
+        rect.width = 60; // 层名称显示宽度
+        GUIStyle labelStyle = new GUIStyle(EditorStyles.label) { fontSize = 10 };
+        EditorGUI.LabelField(rect, particleRenderer.sortingLayerName, labelStyle);
+
+        // 显示当前 Sorting Order 数值（只读）
+        rect.x += rect.width + 5;
+        rect.width = 30; // 数值显示宽度
+        EditorGUI.LabelField(rect, particleRenderer.sortingOrder.ToString(), labelStyle);
+
+        // 绘制“+”按钮
+        rect.x += rect.width + 5;
+        rect.width = 20; // 按钮宽度
+        if (GUI.Button(rect, "+"))
+        {
+            RecordPrefabChange(particleRenderer, obj, "Increment Particle System Sorting Order");
+            particleRenderer.sortingOrder += 1;
+            MarkDirty(particleRenderer, obj);
+            Debug.Log($"Incremented Sorting Order of {obj.name} to {particleRenderer.sortingOrder}");
+        }
+
+        // 绘制“-”按钮
+        rect.x += rect.width + 2;
+        rect.width = 20; // 按钮宽度
+        if (GUI.Button(rect, "-"))
+        {
+            RecordPrefabChange(particleRenderer, obj, "Decrement Particle System Sorting Order");
+            particleRenderer.sortingOrder -= 1;
+            MarkDirty(particleRenderer, obj);
+            Debug.Log($"Decremented Sorting Order of {obj.name} to {particleRenderer.sortingOrder}");
+        }
+    }
+
+    // 记录预制件修改，支持 Undo
+    private static void RecordPrefabChange(Object target, GameObject obj, string undoMessage)
+    {
+        Undo.RecordObject(target, undoMessage);
+        // 如果在预制件编辑模式中，记录预制件根对象的修改
+        if (PrefabStageUtility.GetCurrentPrefabStage() != null)
+        {
+            var prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
+            if (prefabStage.prefabContentsRoot == obj || obj.transform.IsChildOf(prefabStage.prefabContentsRoot.transform))
+            {
+                Undo.RecordObject(prefabStage.prefabContentsRoot, undoMessage);
+            }
+        }
+    }
+
+    // 标记对象为脏，确保修改保存
+    private static void MarkDirty(Object target, GameObject obj)
+    {
+        EditorUtility.SetDirty(target);
+        EditorUtility.SetDirty(obj);
+        // 如果在预制件编辑模式中，保存预制件
+        if (PrefabStageUtility.GetCurrentPrefabStage() != null)
+        {
+            var prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
+            if (prefabStage.prefabContentsRoot == obj || obj.transform.IsChildOf(prefabStage.prefabContentsRoot.transform))
+            {
+                PrefabUtility.SavePrefabAsset(prefabStage.prefabContentsRoot);
+            }
+        }
+    }
+}

Assets/Editor/ParticleSystemHierarchyEditor.cs.meta

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

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -3375,7 +3375,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 4.0039, y: -10.1296}
-  m_SizeDelta: {x: 496.5637, y: 271.6995}
+  m_SizeDelta: {x: 600, y: 271.6995}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8565834461768571561
 CanvasRenderer:

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -3695,8 +3695,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 133.15, y: 0.000024796}
-  m_SizeDelta: {x: 98.1467, y: 79.3136}
+  m_AnchoredPosition: {x: 284.23294, y: 0.000024796}
+  m_SizeDelta: {x: 249.2296, y: 79.3136}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5997908688825554679
 CanvasRenderer:

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

@@ -256,13 +256,13 @@ namespace Fort23.Mono
                     return;
                 }
 
-                if (type2 == 2)
+                if (type2 == 4)
                 {
                     type2 = 0;
                 }
                 else
                 {
-                    type2 = 2;
+                    type2 = 4;
                 }
 
                 Sort(type1, type2);
@@ -274,13 +274,13 @@ namespace Fort23.Mono
                     return;
                 }
 
-                if (type2 == 4)
+                if (type2 == 2)
                 {
                     type2 = 0;
                 }
                 else
                 {
-                    type2 = 4;
+                    type2 = 2;
                 }
 
                 Sort(type1, type2);

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

@@ -79,7 +79,8 @@ namespace Fort23.Mono
                 Text_Level.text = faBaoInfo.FabaoPowerupConfig.ID + "级";
                 Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name);
                 Text_Power.text = $"强度：{faBaoInfo.qiangDu}";
-                Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec), faBaoInfo.effectValue);
+                Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
+                    faBaoInfo.effectValue);
 
                 Text_ItemDesc.text = LanguageManager.Instance.Text(_itemInfo.config.itemDesc);
 
@@ -121,17 +122,25 @@ namespace Fort23.Mono
 
             faBaoSkillWidgets.Clear();
 
-            List<FabaoPowerupConfig> fabaoPowerupConfigs = ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().ToList();
+            List<FabaoPowerupConfig> fabaoPowerupConfigs =
+                ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().ToList();
 
-            var fanappower = fabaoPowerupConfigs.GroupBy(f => f.SkillLevel).Select(g => new { config = g.OrderBy(f => f.ID).FirstOrDefault() }).ToList();
+            var fanappower = fabaoPowerupConfigs.GroupBy(f => f.SkillLevel)
+                .Select(g => new { config = g.OrderBy(f => f.ID).FirstOrDefault() }).ToList();
 
             foreach (var powerupConfigse in fanappower)
             {
+                if (powerupConfigse.config.ID == 1)
+                {
+                    continue;
+                }
+
                 AccountFileInfo.FaBaoData faBaoData = new AccountFileInfo.FaBaoData();
                 faBaoData.id = currentFaBaoInfo.FaBaoData.id;
                 faBaoData.level = powerupConfigse.config.ID;
                 FaBaoInfo _faBaoInfo = new FaBaoInfo(faBaoData);
-                FaBaoSkillWidget faBaoSkillWidget = await UIManager.Instance.CreateGComponent<FaBaoSkillWidget>(null, SkillContent);
+                FaBaoSkillWidget faBaoSkillWidget =
+                    await UIManager.Instance.CreateGComponent<FaBaoSkillWidget>(null, SkillContent);
                 faBaoSkillWidget.CustomInit(currentFaBaoInfo, _faBaoInfo);
                 faBaoSkillWidgets.Add(faBaoSkillWidget);
             }
@@ -142,7 +151,8 @@ namespace Fort23.Mono
             string t = "";
             foreach (var keyValuePair in faBaoInfo.attriButedIC)
             {
-                t = $"{GetAttributeName(keyValuePair.Key)} : {currentFaBaoInfo.attriButedIC[keyValuePair.Key].ToString()}\n";
+                t =
+                    $"{GetAttributeName(keyValuePair.Key)} : {currentFaBaoInfo.attriButedIC[keyValuePair.Key].ToString()}\n";
             }
 
             Text_ShuXingJiaCheng.text = t;
@@ -166,7 +176,8 @@ namespace Fort23.Mono
 
         public async static CTask<FaBaoDetailsPanel> OpenPanel(ItemInfo faBaoInfo)
         {
-            FaBaoDetailsPanel selectFaBaoPanel = await UIManager.Instance.LoadAndOpenPanel<FaBaoDetailsPanel>(null, UILayer.Top);
+            FaBaoDetailsPanel selectFaBaoPanel =
+                await UIManager.Instance.LoadAndOpenPanel<FaBaoDetailsPanel>(null, UILayer.Top);
             selectFaBaoPanel.CustomInit(faBaoInfo);
             return selectFaBaoPanel;
         }

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: -2553
+    y: 483
+    width: 2560
+    height: 829
+  m_ShowMode: 0
+  m_Title: 
+  m_RootView: {fileID: 6}
+  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: 662
   m_ShowMode: 0
   m_Title: Console
-  m_RootView: {fileID: 5}
+  m_RootView: {fileID: 8}
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   m_Maximized: 0
---- !u!114 &2
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -38,17 +62,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -1073
-    y: 96
+    x: -1208
+    y: 99
     width: 1208
-    height: 1299
+    height: 1293
   m_ShowMode: 0
   m_Title: Game
-  m_RootView: {fileID: 7}
+  m_RootView: {fileID: 10}
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   m_Maximized: 0
---- !u!114 &3
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -67,12 +91,63 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Scene
-  m_RootView: {fileID: 8}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 11}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &4
+--- !u!114 &5
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: HotReloadWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 2560
+    height: 829
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 19}
+  m_Panes:
+  - {fileID: 19}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &6
+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: 5}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 2560
+    height: 829
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 192
+  draggingID: 0
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -91,14 +166,14 @@ MonoBehaviour:
     y: 0
     width: 1189
     height: 662
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &5
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -111,7 +186,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 4}
+  - {fileID: 7}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -121,9 +196,9 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 28991
+  controlID: 43
   draggingID: 0
---- !u!114 &6
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -141,15 +216,15 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1208
-    height: 1299
+    height: 1293
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -162,19 +237,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
     width: 1208
-    height: 1299
+    height: 1293
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 10714
+  controlID: 18
   draggingID: 0
---- !u!114 &8
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -187,9 +262,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 11}
-  - {fileID: 10}
+  - {fileID: 12}
+  - {fileID: 14}
+  - {fileID: 13}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -202,7 +277,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &9
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -224,7 +299,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &10
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -245,7 +320,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &11
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -258,10 +333,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 13}
-  - {fileID: 14}
   - {fileID: 15}
+  - {fileID: 16}
+  - {fileID: 17}
+  - {fileID: 18}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -271,9 +346,9 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 1145
+  controlID: 184
   draggingID: 0
---- !u!114 &12
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -292,15 +367,15 @@ MonoBehaviour:
     y: 0
     width: 1209
     height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 17}
-  - {fileID: 19}
+  - {fileID: 21}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -319,14 +394,14 @@ MonoBehaviour:
     y: 0
     width: 411
     height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -347,12 +422,12 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 25}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 25}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -371,14 +446,48 @@ MonoBehaviour:
     y: 0
     width: 573
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 22}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 26}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 26}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &16
+--- !u!114 &19
+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: 11500000, guid: f62a84c0b148b0a4582bdd9f1a69e6d3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: ' Hot Reload'
+    m_Image: {fileID: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: -2553
+    y: 483
+    width: 2560
+    height: 808
+  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 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -412,7 +521,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &17
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -901,7 +1010,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &18
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -921,10 +1030,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1073
-    y: 96
+    x: -1208
+    y: 99
     width: 1208
-    height: 1278
+    height: 1272
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -978,28 +1087,28 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 1208
-      height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 604, y: 628.5}
+      height: 1251
+    m_Scale: {x: 0.7703202, y: 0.7703202}
+    m_Translation: {x: 604, y: 625.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -780.34686
+      x: -784.08954
       y: -812
-      width: 1560.6937
+      width: 1568.1791
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 1208, y: 1278}
+  m_defaultScale: 0.7703202
+  m_LastWindowPixelSize: {x: 1208, y: 1272}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &19
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1086,7 +1195,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &20
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1123,25 +1232,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: e04debff
-      m_LastClickedID: -1356320
-      m_ExpandedIDs: fa4debff004eebff4aa3ebff4ea3ebff5ca3ebff1cd5ecff22d5ecff24d6ecff68d6ecff70d6ecff7ed6ecff6a65edff7065edff5476edff0077edff0677edff4477edff5a05eeff6005eeff6206eeffa606eeffaa06eeffbc06eeff986ceeff9e6ceeffd41befffda1befffa29defffa89defffaa9eefffee9eefff049fefffbcb4efff2cb5efff227bf0ff307bf0ff2a91f2ffbed8f2ffc4d8f2ffa2d9f2fffed9f2ff02daf2ff10daf2ff842cf3ffda8bf3ffe08bf3ffcac5f3ff16def3ff92f6f3ff9af6f3ffb6f8f3ff16f9f3ff1ef9f3ff28f9f3ff32f9f3ffcaf9f3ff3441f4ff7841f4ff7c41f4ff8e41f4ff804df4ffd84df4ffe04df4ffea4df4fff44df4ff6c4ef4ff8c4ef4ff6486f4ff6a86f4ff6c87f4ffb087f4ffb487f4ffb887f4ffbc87f4ffc687f4ffc22cf5ffca2cf5ff042df5ff0e2df5ffa62df5ff1867f5ff1e67f5ff6468f5ff6868f5ff7a68f5ff5a01f6ff6201f6ffb402f6ffe403f6ffee03f6fff803f6ff9004f6ff7043f6ff7643f6ff7a44f6ffc644f6ffca44f6ffdc44f6ff66d2fcff26d3fcff2ed3fcff38d3fcff42d3fcffdad3fcff1e43fdff2443fdff2844fdff6444fdff6844fdff7a44fdff78fafffff4ffffff80c50000bac50000
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: bac4feffc0c4feff845bffff8a5bffffd85cffffe65cffffeaf1fffff0f1ffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: myImage
-        m_OriginalName: myImage
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -1067844
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 13}
+        m_ClientGUIView: {fileID: 16}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -1149,7 +1258,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &21
+--- !u!114 &25
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1194,7 +1303,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI/DivineSence
+    - Assets/Scripts/GameUI/UI/GuidePanel
     m_Globs: []
     m_OriginalText: gamerun
     m_ImportLogFlags: 0
@@ -1202,16 +1311,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI/DivineSence
+  - Assets/Scripts/GameUI/UI/GuidePanel
   m_LastFoldersGridSize: -1
   m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 08cc0000
-    m_LastClickedID: 52232
-    m_ExpandedIDs: 0000000068cb00006acb00006ccb00006ecb000070cb000072cb000074cb000076cb000078cb00007acb00007ccb0000becb000000ca9a3b
+    scrollPos: {x: 0, y: 406}
+    m_SelectedIDs: 80cb0000
+    m_LastClickedID: 52096
+    m_ExpandedIDs: 0000000074cb000076cb000078cb00007acb00007ccb00007ecb000080cb000082cb000084cb000086cb000088cb0000c8cb0000d0cb0000180401001a04010000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1227,7 +1336,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 14}
+      m_ClientGUIView: {fileID: 17}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1239,7 +1348,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000068cb00006acb00006ccb00006ecb000070cb000072cb000074cb000076cb000078cb00007acb00007ccb000000ca9a3b
+    m_ExpandedIDs: 0000000074cb000076cb000078cb00007acb00007ccb00007ecb000080cb000082cb000084cb000086cb000088cb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1283,7 +1392,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 14}
+      m_ClientGUIView: {fileID: 17}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1295,7 +1404,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 115
---- !u!114 &22
+--- !u!114 &26
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}