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

# Conflicts:
#	Assets/Art/ParallaxCloud/Material/ParallaxCloud.mat   resolved by master version

Assets/Scenes/testCombat.scene

@@ -408,6 +408,221 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 1.846, y: 2.903, z: 9.044}
+--- !u!213 &119886128
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: icon_skill_40001(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 128
+    height: 128
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    3fb1e3f2ace104b39a8b5a61d145264f: 21300000
+  m_AtlasTags:
+  - skillIcon
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 0ad723bf0ad7233f000000000ad7233f0ad723bf000000000ad7233f0ad7233f000000000ad723bf0ad723bf000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 128
+      height: 128
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 64, z: 100, w: 64}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 0ad723bf0ad7233f000000000ad7233f0ad723bf000000000ad7233f0ad7233f000000000ad723bf0ad723bf000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 272
+      y: 0
+      width: 128
+      height: 128
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 272, y: 0}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 336, z: 100, w: 64}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: -0.64, y: 0.64}
+    - {x: -0.64, y: -0.64}
+    - {x: 0.64, y: -0.64}
+    - {x: 0.64, y: 0.64}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!213 &121000859
 Sprite:
   m_ObjectHideFlags: 0
@@ -3447,6 +3662,221 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
   m_PrefabInstance: {fileID: 1663534286}
   m_PrefabAsset: {fileID: 0}
+--- !u!213 &1671186133
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: icon_skill_40001(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 128
+    height: 128
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    3fb1e3f2ace104b39a8b5a61d145264f: 21300000
+  m_AtlasTags:
+  - skillIcon
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 0ad723bf0ad7233f000000000ad7233f0ad723bf000000000ad7233f0ad7233f000000000ad723bf0ad723bf000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 128
+      height: 128
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 64, z: 100, w: 64}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 0ad723bf0ad7233f000000000ad7233f0ad723bf000000000ad7233f0ad7233f000000000ad723bf0ad723bf000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 272
+      y: 0
+      width: 128
+      height: 128
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 272, y: 0}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 336, z: 100, w: 64}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: -0.64, y: 0.64}
+    - {x: -0.64, y: -0.64}
+    - {x: 0.64, y: -0.64}
+    - {x: 0.64, y: 0.64}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!213 &1677642915
 Sprite:
   m_ObjectHideFlags: 0
@@ -4651,6 +5081,30 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3420651838577565557, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5847779211741130419, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5847779211741130419, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5847779211741130419, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5847779211741130419, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5847779211741130419, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8621307692776546600, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
@@ -5506,10 +5960,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1663534287}
     m_Modifications:
+    - target: {fileID: 783959183306740487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 1671186133}
     - target: {fileID: 2321659853550357760, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
       propertyPath: m_Name
       value: ZhuanPanPanel
       objectReference: {fileID: 0}
+    - target: {fileID: 3037646968079858960, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 119886128}
     - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Scripts/GameLogic/Combat/CombatEvent/CombatEventType.cs

@@ -26,6 +26,10 @@
         /// </summary>
         UseSkill,
         /// <summary>
+        /// 技能使用完成
+        /// </summary>
+        UseSkillFinish,
+        /// <summary>
         /// 激活战斗
         /// </summary>
         ActiveCombat,
@@ -77,6 +81,13 @@
         /// 技能槽位改变
         /// </summary>
         SkillSlotsAlter,
+        /// <summary>
+        /// 大道修改
+        /// </summary>
         TaoismSkillAlter,
+        /// <summary>
+        /// 补填技能槽位
+        /// </summary>
+        FillInSkillSlots,
     }
 }

Assets/Scripts/GameLogic/Combat/CombatEvent/FillInSkillSlotsEventData.cs

@@ -0,0 +1,17 @@
+using Core.Utility.Event;
+using GameLogic.Combat.Hero.Turntable;
+using GameLogic.Combat.Skill;
+
+namespace Common.Utility.CombatEvent
+{
+    public class FillInSkillSlotsEventData : EventDataBasic<FillInSkillSlotsEventData>
+    {
+        public SkillBasic SkillBasic;
+        public SkillSlots SkillSlots;
+        protected override void ProDispose()
+        {
+            SkillBasic = null;
+            SkillSlots = null;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/FillInSkillSlotsEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ce61a4c667f342ffb203e516bb5ae1ad
+timeCreated: 1744969436

Assets/Scripts/GameLogic/Combat/CombatEvent/UseMagicWeaponEventData.cs

@@ -3,7 +3,7 @@ using GameLogic.Combat.Hero;
 
 namespace Common.Utility.CombatEvent
 {
-    public class UseMagicWeaponEventData : EventDataBasic<Combat_EquipFallEventData>
+    public class UseMagicWeaponEventData : EventDataBasic<UseMagicWeaponEventData>
     {
         public CombatHeroEntity combatHeroEntity;
         public CombatMagicWeaponEntity combatMagicWeaponEntity;

Assets/Scripts/GameLogic/Combat/CombatEvent/UseSkillFinishEventData.cs

@@ -0,0 +1,15 @@
+using Core.Utility.Event;
+using GameLogic.Combat.Hero;
+using GameLogic.Combat.Skill;
+
+namespace Common.Utility.CombatEvent
+{
+    public class UseSkillFinishEventData: EventDataBasic<UseSkillFinishEventData>
+    {
+        public SkillBasic SkillBasic;
+        protected override void ProDispose()
+        {
+            SkillBasic = null;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/UseSkillFinishEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 75fb9aae64e0448d9d8ce7c4e3e7e0ce
+timeCreated: 1744967318

Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs

@@ -49,7 +49,11 @@ namespace GameLogic.Combat.Hero.Turntable
                 return;
             }
 
+
             currUseFinishSkill.Add(skillBasic);
+            UseSkillFinishEventData useSkillFinishEventData = UseSkillFinishEventData.Create();
+            useSkillFinishEventData.SkillBasic = skillBasic;
+            CombatEventManager.Instance.Dispatch(CombatEventType.UseSkillFinish, useSkillFinishEventData);
         }
 
         public async CTask SetNewSkill(SkillInfo[] allSkill)
@@ -131,54 +135,56 @@ namespace GameLogic.Combat.Hero.Turntable
                 for (int i = 0; i < currUseFinishSkill.Count; i++)
                 {
                     SkillBasic dengDaiSkill = currUseFinishSkill[i];
+                    bool isOk = false;
                     switch (dengDaiSkill.wuXingType)
                     {
                         case WuXingType.Gold:
                             if (triggerType == 0)
                             {
-                                skillSlots.SetSkill(dengDaiSkill);
-                                currUseFinishSkill.RemoveAt(i);
-                                return;
+                                isOk = true;
                             }
 
                             break;
                         case WuXingType.Water:
                             if (triggerType == 1)
                             {
-                                skillSlots.SetSkill(dengDaiSkill);
-                                currUseFinishSkill.RemoveAt(i);
-                                return;
+                                isOk = true;
                             }
 
                             break;
                         case WuXingType.Wood:
                             if (triggerType == 2)
                             {
-                                skillSlots.SetSkill(dengDaiSkill);
-                                currUseFinishSkill.RemoveAt(i);
-                                return;
+                                isOk = true;
                             }
 
                             break;
                         case WuXingType.Fire:
                             if (triggerType == 3)
                             {
-                                skillSlots.SetSkill(dengDaiSkill);
-                                currUseFinishSkill.RemoveAt(i);
-                                return;
+                                isOk = true;
                             }
 
                             break;
                         case WuXingType.Earth:
                             if (triggerType == 4)
                             {
-                                skillSlots.SetSkill(dengDaiSkill);
-                                currUseFinishSkill.RemoveAt(i);
-                                return;
+                                isOk = true;
                             }
 
                             break;
                     }
+
+                    if (isOk)
+                    {
+                        skillSlots.SetSkill(dengDaiSkill);
+                        currUseFinishSkill.RemoveAt(i);
+                        FillInSkillSlotsEventData fillInSkillSlotsEventData = FillInSkillSlotsEventData.Create();
+                        fillInSkillSlotsEventData.SkillBasic = dengDaiSkill;
+                        fillInSkillSlotsEventData.SkillSlots = skillSlots;
+                        CombatEventManager.Instance.Dispatch(CombatEventType.FillInSkillSlots,fillInSkillSlotsEventData);
+                        return;
+                    }
                 }
 
                 return;
@@ -263,7 +269,6 @@ namespace GameLogic.Combat.Hero.Turntable
             CombatEventManager.Instance.Dispatch(CombatEventType.AddUseGongFa, addUseGongFaEventData);
         }
 
-  
 
         public void Update(float t, float angle)
         {

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

@@ -0,0 +1,36 @@
+using GameLogic.Combat.Skill;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "DengDaiSkillWidget")]
+    public partial class DengDaiSkillWidget : UIComponent
+    {
+        public SkillBasic SkillBasic;
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public override void DormancyObj()
+        {
+            base.DormancyObj();
+            SkillBasic = null;
+        }
+
+        public void ShowWidget(SkillBasic skillBasic)
+        {
+            this.SkillBasic = skillBasic;
+        }
+    }
+}

Assets/Scripts/GameUI/UI/CombatPanel/DengDaiSkillWidget.cs.meta

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

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

@@ -0,0 +1,29 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class DengDaiSkillWidget 
+	{
+	  #region 自定义数据 
+	  private MyImage _skillIcon;
+	  public MyImage skillIcon
+	   {
+	   get{
+	      if (_skillIcon == null)
+	       {
+	         _skillIcon  = GetUIUnit<MyImage>("skillIcon"); 
+	       }
+	      return _skillIcon;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/CombatPanel/DengDaiSkillWidgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CXNNvX+kVHNILtlCPBGB6Bi+ErNbh+Q/ZbL9IUFiOL/C1bdcW8MmxKOQLOPU
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,172 @@
+using System.Collections.Generic;
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Skill;
+using GameLogic.Player;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "WuXingGongFaWidget")]
+    public partial class WuXingGongFaWidget : UIComponent
+    {
+        public int index;
+
+        private SkillBasic currUseSkill;
+
+        private List<DengDaiSkillWidget> currDengDaiSkill = new List<DengDaiSkillWidget>();
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdate);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, UseSkill);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkillFinish, UseSkillFinish);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.FillInSkillSlots, FillInSkillSlots);
+        }
+
+        public override void DelEvent()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdate);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkill, UseSkill);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkillFinish, UseSkillFinish);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.FillInSkillSlots, FillInSkillSlots);
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void ShowWidget(int index)
+        {
+            this.index = index;
+        }
+
+        private void FillInSkillSlots(IEventData iEventData)
+        {
+            FillInSkillSlotsEventData fillInSkillSlotsEventData = iEventData as FillInSkillSlotsEventData;
+            if (fillInSkillSlotsEventData.SkillBasic.CombatHeroEntity.IsEnemy)
+            {
+                return;
+            }
+
+            for (int i = 0; i < currDengDaiSkill.Count; i++)
+            {
+                DengDaiSkillWidget skillWidget = currDengDaiSkill[i];
+                if (currDengDaiSkill[i].SkillBasic == fillInSkillSlotsEventData.SkillBasic)
+                {
+                    UIManager.Instance.DormancyGComponent(skillWidget);
+                    currDengDaiSkill.RemoveAt(i);
+                }
+            }
+        }
+
+        private async void UseSkillFinish(IEventData iEventData)
+        {
+            UseSkillFinishEventData combatUseSkillEventData = iEventData as UseSkillFinishEventData;
+            if (combatUseSkillEventData.SkillBasic.CombatHeroEntity.IsEnemy)
+            {
+                return;
+            }
+          
+            SkillBasic skillBasic = combatUseSkillEventData.SkillBasic;
+            bool isOk = IsMyWuXing(skillBasic.wuXingType);
+            if (!isOk)
+            {
+                return;
+            }
+            useSkillIcon.gameObject.SetActive(false);
+            DengDaiSkillWidget dengDaiSkillWidget =
+                await UIManager.Instance.CreateGComponentForObject<DengDaiSkillWidget>(DengDaiSkillWidget, null,
+                    root: dengDaiSkill, isInstance: true);
+            dengDaiSkillWidget.ShowWidget(skillBasic);
+            currDengDaiSkill.Add(dengDaiSkillWidget);
+        }
+
+        private bool IsMyWuXing(WuXingType wuXingType)
+        {
+            bool isOk = false;
+            switch (wuXingType)
+            {
+                case WuXingType.Gold:
+                    if (index == 0)
+                    {
+                        isOk = true;
+                    }
+
+                    break;
+                case WuXingType.Water:
+                    if (index == 1)
+                    {
+                        isOk = true;
+                    }
+
+                    break;
+                case WuXingType.Wood:
+                    if (index == 2)
+                    {
+                        isOk = true;
+                    }
+
+                    break;
+                case WuXingType.Fire:
+                    if (index == 3)
+                    {
+                        isOk = true;
+                    }
+
+                    break;
+                case WuXingType.Earth:
+                    if (index == 4)
+                    {
+                        isOk = true;
+                    }
+
+                    break;
+            }
+
+            return isOk;
+        }
+
+        private void UseSkill(IEventData iEventData)
+        {
+            CombatUseSkillEventData combatUseSkillEventData = iEventData as CombatUseSkillEventData;
+            if (!combatUseSkillEventData.useSkill.CombatHeroEntity.IsEnemy)
+            {
+                bool isOk = IsMyWuXing(combatUseSkillEventData.useSkill.wuXingType);
+             
+                if (isOk)
+                {
+                    currUseSkill = combatUseSkillEventData.useSkill;
+                    useSkillIcon.gameObject.SetActive(true);
+                    useSkillIcon.icon_name = combatUseSkillEventData.useSkill.SelfSkillConfig.icon;
+                }
+            }
+        }
+
+        private void AddUseGongFa(IEventData iEventData)
+        {
+            AddUseGongFaEventData addUseGongFaEventData = iEventData as AddUseGongFaEventData;
+            if (!addUseGongFaEventData.SkillBasic.CombatHeroEntity.IsEnemy)
+            {
+                bool isOk = IsMyWuXing(addUseGongFaEventData.SkillBasic.wuXingType);
+               
+                if (isOk)
+                {
+                    uitween.Play("show", false);
+                }
+            }
+        }
+
+        private void HeroHpUpdate(IEventData iEventData)
+        {
+            CombatHeroInfo combatHeroInfo = CombatController.currActiveCombat.CombatHeroController
+                .playerHeroEntity.CurrCombatHeroInfo;
+        }
+    }
+}

Assets/Scripts/GameUI/UI/CombatPanel/WuXingGongFaWidget.cs.meta

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

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

@@ -0,0 +1,64 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+using Core.UI.UTool.UITween;
+
+namespace Fort23.Mono
+{
+	public partial class WuXingGongFaWidget 
+	{
+	  #region 自定义数据 
+	  private UITweenController _uitween;
+	  public UITweenController uitween
+	   {
+	   get{
+	      if (_uitween == null)
+	       {
+	         _uitween  = GetUIUnit<UITweenController>("uitween"); 
+	       }
+	      return _uitween;
+	     }
+	   }
+	  private MyImage _useSkillIcon;
+	  public MyImage useSkillIcon
+	   {
+	   get{
+	      if (_useSkillIcon == null)
+	       {
+	         _useSkillIcon  = GetUIUnit<MyImage>("useSkillIcon"); 
+	       }
+	      return _useSkillIcon;
+	     }
+	   }
+	  private RectTransform _dengDaiSkill;
+	  public RectTransform dengDaiSkill
+	   {
+	   get{
+	      if (_dengDaiSkill == null)
+	       {
+	         _dengDaiSkill  = GetUIUnit<RectTransform>("dengDaiSkill"); 
+	       }
+	      return _dengDaiSkill;
+	     }
+	   }
+	  private GameObject _DengDaiSkillWidget;
+	  public GameObject DengDaiSkillWidget
+	   {
+	   get{
+	      if (_DengDaiSkillWidget == null)
+	       {
+	         _DengDaiSkillWidget  = GetUIUnit<GameObject>("DengDaiSkillWidget"); 
+	       }
+	      return _DengDaiSkillWidget;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/CombatPanel/WuXingGongFaWidgetData.cs.meta

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

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

@@ -17,7 +17,31 @@ namespace Fort23.Mono
 
         public static async CTask OpenZhuanPanPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<ZhuanPanPanel>(null, UILayer.Bottom);
+            ZhuanPanPanel zhuanPanPanel =
+                await UIManager.Instance.LoadAndOpenPanel<ZhuanPanPanel>(null, UILayer.Bottom);
+            zhuanPanPanel.ShowPanel();
+        }
+
+        public async CTask ShowPanel()
+        {
+            UIManager.Instance.DormancyAllGComponent<WuXingGongFaWidget>();
+            for (int i = 0; i < 5; i++)
+            {
+                double hd = i * 72 * Math.PI / 180f;
+                double a = Math.Cos(hd);
+                double b = -Math.Sin(hd);
+                double c = Math.Sin(hd);
+                double d = a;
+                double x = a * 0 + b * 120;
+                double y = c * 0 + d * 120;
+
+                int index = i;
+                WuXingGongFaWidget widget = await UIManager.Instance.CreateGComponentForObject<WuXingGongFaWidget>(
+                    WuXingGongFaWidget, null, root: pan,
+                    isInstance: true);
+                widget.transform.anchoredPosition = new Vector2((float)x, (float)y);
+                widget.ShowWidget(index);
+            }
         }
 
         private void Init()
@@ -28,8 +52,8 @@ namespace Fort23.Mono
         {
             StaticUpdater.Instance.AddLateUpdateCallBack(Update);
             CombatEventManager.Instance.AddEventListener(CombatEventType.ExercisesAlter, ExercisesAlter);
-            CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
-            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdate);
+ 
+           
             CombatEventManager.Instance.AddEventListener(CombatEventType.TaoismSkillAlter, TaoismSkillAlter);
         }
 
@@ -37,8 +61,8 @@ namespace Fort23.Mono
         {
             StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.ExercisesAlter, ExercisesAlter);
-            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
-            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdate);
+            // CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+      
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.TaoismSkillAlter, TaoismSkillAlter);
         }
 
@@ -52,27 +76,8 @@ namespace Fort23.Mono
         {
         }
 
-        private void AddUseGongFa(IEventData iEventData)
-        {
-            CombatHeroInfo combatHeroInfo = CombatController.currActiveCombat.CombatHeroController
-                .playerHeroEntity.CurrCombatHeroInfo;
-            jin_shangshi.text = combatHeroInfo.Metal_Injury>0?"伤势：" + combatHeroInfo.Metal_Injury:"";
-            mu_shangshi.text =  combatHeroInfo.Wood_Injury>0?"伤势：" + combatHeroInfo.Wood_Injury:"";
-            shui_shangshi.text = combatHeroInfo.Water_Injury>0?"伤势：" + combatHeroInfo.Water_Injury:"";
-            huo_shangshi.text =  combatHeroInfo.Fire_Injury>0?"伤势：" + combatHeroInfo.Fire_Injury:"";
-            tu_shangshi.text = combatHeroInfo.Earth_Injury>0?"伤势：" + combatHeroInfo.Earth_Injury:"";
-        }
 
-        private void HeroHpUpdate(IEventData iEventData)
-        {
-            CombatHeroInfo combatHeroInfo = CombatController.currActiveCombat.CombatHeroController
-                .playerHeroEntity.CurrCombatHeroInfo;
-            jin_shangshi.text = combatHeroInfo.Metal_Injury>0?"伤势：" + combatHeroInfo.Metal_Injury:"";
-            mu_shangshi.text =  combatHeroInfo.Wood_Injury>0?"伤势：" + combatHeroInfo.Wood_Injury:"";
-            shui_shangshi.text = combatHeroInfo.Water_Injury>0?"伤势：" + combatHeroInfo.Water_Injury:"";
-            huo_shangshi.text =  combatHeroInfo.Fire_Injury>0?"伤势：" + combatHeroInfo.Fire_Injury:"";
-            tu_shangshi.text = combatHeroInfo.Earth_Injury>0?"伤势：" + combatHeroInfo.Earth_Injury:"";
-        }
+   
 
         private async void ExercisesAlter(IEventData iEventData)
         {
@@ -130,28 +135,28 @@ namespace Fort23.Mono
             for (int i = 0; i < _gfWidgets.Count; i++)
             {
                 gf_widget gfWidget = _gfWidgets[i];
-                if (gfWidget.useCount != gfWidget.SkillBasic.useCount)
-                {
-                    gfWidget.useCount = gfWidget.SkillBasic.useCount;
-                    switch (gfWidget.SkillBasic.useTriggerType)
-                    {
-                        case 0:
-                            jin.Play("show", false);
-                            break;
-                        case 1:
-                            mu.Play("show", false);
-                            break;
-                        case 2:
-                            shui.Play("show", false);
-                            break;
-                        case 3:
-                            huo.Play("show", false);
-                            break;
-                        case 4:
-                            tu.Play("show", false);
-                            break;
-                    }
-                }
+                // if (gfWidget.useCount != gfWidget.SkillBasic.useCount)
+                // {
+                //     gfWidget.useCount = gfWidget.SkillBasic.useCount;
+                //     switch (gfWidget.SkillBasic.useTriggerType)
+                //     {
+                //         case 0:
+                //             jin.Play("show", false);
+                //             break;
+                //         case 1:
+                //             mu.Play("show", false);
+                //             break;
+                //         case 2:
+                //             shui.Play("show", false);
+                //             break;
+                //         case 3:
+                //             huo.Play("show", false);
+                //             break;
+                //         case 4:
+                //             tu.Play("show", false);
+                //             break;
+                //     }
+                // }
 
 
                 double hd = gfWidget.SkillBasic.angle * Math.PI / 180f;

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

@@ -43,50 +43,6 @@ namespace Fort23.Mono
 	      return _jin;
 	     }
 	   }
-	  private UITweenController _mu;
-	  public UITweenController mu
-	   {
-	   get{
-	      if (_mu == null)
-	       {
-	         _mu  = GetUIUnit<UITweenController>("mu"); 
-	       }
-	      return _mu;
-	     }
-	   }
-	  private UITweenController _shui;
-	  public UITweenController shui
-	   {
-	   get{
-	      if (_shui == null)
-	       {
-	         _shui  = GetUIUnit<UITweenController>("shui"); 
-	       }
-	      return _shui;
-	     }
-	   }
-	  private UITweenController _huo;
-	  public UITweenController huo
-	   {
-	   get{
-	      if (_huo == null)
-	       {
-	         _huo  = GetUIUnit<UITweenController>("huo"); 
-	       }
-	      return _huo;
-	     }
-	   }
-	  private UITweenController _tu;
-	  public UITweenController tu
-	   {
-	   get{
-	      if (_tu == null)
-	       {
-	         _tu  = GetUIUnit<UITweenController>("tu"); 
-	       }
-	      return _tu;
-	     }
-	   }
 	  private Image _lanLiang;
 	  public Image lanLiang
 	   {
@@ -109,59 +65,37 @@ namespace Fort23.Mono
 	      return _jin_shangshi;
 	     }
 	   }
-	  private Text _mu_shangshi;
-	  public Text mu_shangshi
-	   {
-	   get{
-	      if (_mu_shangshi == null)
-	       {
-	         _mu_shangshi  = GetUIUnit<Text>("mu_shangshi"); 
-	       }
-	      return _mu_shangshi;
-	     }
-	   }
-	  private Text _shui_shangshi;
-	  public Text shui_shangshi
-	   {
-	   get{
-	      if (_shui_shangshi == null)
-	       {
-	         _shui_shangshi  = GetUIUnit<Text>("shui_shangshi"); 
-	       }
-	      return _shui_shangshi;
-	     }
-	   }
-	  private Text _huo_shangshi;
-	  public Text huo_shangshi
+	  private Button _lanLiang_button;
+	  public Button lanLiang_button
 	   {
 	   get{
-	      if (_huo_shangshi == null)
+	      if (_lanLiang_button == null)
 	       {
-	         _huo_shangshi  = GetUIUnit<Text>("huo_shangshi"); 
+	         _lanLiang_button  = GetUIUnit<Button>("lanLiang_button"); 
 	       }
-	      return _huo_shangshi;
+	      return _lanLiang_button;
 	     }
 	   }
-	  private Text _tu_shangshi;
-	  public Text tu_shangshi
+	  private GameObject _WuXingGongFaWidget;
+	  public GameObject WuXingGongFaWidget
 	   {
 	   get{
-	      if (_tu_shangshi == null)
+	      if (_WuXingGongFaWidget == null)
 	       {
-	         _tu_shangshi  = GetUIUnit<Text>("tu_shangshi"); 
+	         _WuXingGongFaWidget  = GetUIUnit<GameObject>("WuXingGongFaWidget"); 
 	       }
-	      return _tu_shangshi;
+	      return _WuXingGongFaWidget;
 	     }
 	   }
-	  private Button _lanLiang_button;
-	  public Button lanLiang_button
+	  private RectTransform _pan;
+	  public RectTransform pan
 	   {
 	   get{
-	      if (_lanLiang_button == null)
+	      if (_pan == null)
 	       {
-	         _lanLiang_button  = GetUIUnit<Button>("lanLiang_button"); 
+	         _pan  = GetUIUnit<RectTransform>("pan"); 
 	       }
-	      return _lanLiang_button;
+	      return _pan;
 	     }
 	   }
 	  #endregion 自定义数据结束 

UserSettings/EditorUserSettings.asset

@@ -21,46 +21,46 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5207575055075d580f595a2046720d44431619287b2e71637e7f4b67e4e5626e
+      value: 5400010356575a0d5d0d587a14710644104f4c2f7c2c2469787c4461e3b2326f
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5402055e01025b5a095e587749765c44464e4b78292a20322c7f4b67b3b4653e
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a53025f0407580f0b08597b48765b441216197d28292461297b496ae3b8326b
+      value: 5409015152055b030e085b7212215944454f4d727c7b73677f7b4437e4e3646f
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
+      value: 555206545c000f095f0a08711577071214164e7c7f7d2033747c4832e7b3626b
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 0607055350075e5d0e56587042210b444e164173747a24357c784c62b1b5373e
+      value: 515702525d040a085b0d0e70167706484515492c2e7f27322c7c1f6abae26539
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 53010604000559080958097347250f44444e48732e707e34797e1f30b4e3376f
+      value: 5454505755025b5d5d5f0a74487709404516192f287971662e2b4564e3e4373e
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 57000255510d585a580d0a7042775e4447151c7d747d20647b781931e6b36168
+      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bac405d49904f9449914a449c4d4c9c9e4984af97dbebc2d7f9eec2d1d1b4f3f8dfe8fee6f4b1b9f0fbaa8efff8afe5fc9295949798ee9c94958585b7ede2daa4d69089c2949d9483d5888b97ddeccfbbd2fdf0c3f3eacec0f2c8ffcacccde437eaf9397b7a
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba7455d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd8b8b91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969b89eacfcc
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c828d84dd8e8ad4888b8ed5f1dff7dce5bdd1fbf5c4c0ebc8ffcfc6c4e133e3ff373e363aefa1a5ab
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828e91f0beb6fdd1cbfceba0b9f0b3bed8e8f5aae0fe8c9396999fef9c94909e96e285849ffcca90898c86d198899ac5
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5465d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fbafe0e1928b86d888ed919c928797a7cf
       flags: 0
     UnityEditor.ShaderGraph.ToggleSettings:
       value: 18135d1527590858060c032302276919051e1a26296a7c243f3c187fa0e92708f0e220e0e22d09352a0bed30017c5b2be01f0c47b40219221f1ded0b12eb1f0127cc0bcc18c41a5e910d0edbc85193e0dadadbf8e8f9e8ced7dba5e0b6aaaca4dbfeabfef4eae1