修改bug

Assets/Res/Config/SkillConfig.json

@@ -341,6 +341,29 @@
       "intensifierIndex": [
         0
       ]
+    },
+    {
+      "ID": 601011,
+      "power": 100.0,
+      "name": "星辰道",
+      "dec": "每次释放功法时获得一定的能量，能量满后提升转盘速度",
+      "attribute": 1,
+      "icon": "icon_skill_10003",
+      "scriptName": "DS60101",
+      "IDGroup": 60101,
+      "timelineName": "",
+      "cd": null,
+      "SkillType": 4,
+      "level": 1,
+      "effectValue": [
+        10.0,
+        100.0,
+        50.0,
+        3.0
+      ],
+      "intensifierIndex": [
+        0
+      ]
     }
   ]
 }

Assets/Res/UI/SkillSelectPanel.prefab

@@ -632,7 +632,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6694772361877173011
 RectTransform:
   m_ObjectHideFlags: 0
@@ -650,6 +650,7 @@ RectTransform:
   - {fileID: 8153636129082282834}
   - {fileID: 4432141581528358927}
   - {fileID: 1450357347166671142}
+  - {fileID: 6137712158812080504}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -736,7 +737,102 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: XiuXing
+    gameObject: {fileID: 1900879669909446825}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 1
+--- !u!1 &2894969680513859522
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 162988035528066952}
+  - component: {fileID: 8634983061040860559}
+  - component: {fileID: 1181118557484355282}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &162988035528066952
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2894969680513859522}
+  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
+  m_Children: []
+  m_Father: {fileID: 6137712158812080504}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8634983061040860559
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2894969680513859522}
+  m_CullTransparentMesh: 1
+--- !u!114 &1181118557484355282
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2894969680513859522}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4FEE\u884C\u4E4B\u9053"
 --- !u!1 &2953243426765634668
 GameObject:
   m_ObjectHideFlags: 0
@@ -1715,6 +1811,128 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5592738191440515259
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6137712158812080504}
+  - component: {fileID: 6449946519514092780}
+  - component: {fileID: 1348512701796443855}
+  - component: {fileID: 1900879669909446825}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: XiuXing
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6137712158812080504
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5592738191440515259}
+  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
+  m_Children:
+  - {fileID: 162988035528066952}
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -164, y: 267}
+  m_SizeDelta: {x: 160, y: 37.68}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6449946519514092780
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5592738191440515259}
+  m_CullTransparentMesh: 1
+--- !u!114 &1348512701796443855
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5592738191440515259}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1900879669909446825
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5592738191440515259}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1348512701796443855}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5996491313444476210
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/TaoismPanel.prefab

@@ -0,0 +1,717 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &470344533476171378
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1303673304660186662}
+  - component: {fileID: 1344154649722175200}
+  - component: {fileID: 7874435413531388385}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: massge
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1303673304660186662
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 470344533476171378}
+  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
+  m_Children: []
+  m_Father: {fileID: 1365871677352826847}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 3.6, y: -7}
+  m_SizeDelta: {x: 650.4, y: 196}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1344154649722175200
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 470344533476171378}
+  m_CullTransparentMesh: 1
+--- !u!114 &7874435413531388385
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 470344533476171378}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u661F\u8FB0\u9053\uFF1A\u6BCF\u6B21\u91CA\u653E\u529F\u6CD5\u65F6\u83B7\u5F97\u4E00\u5B9A\u7684\u80FD\u91CF\uFF0C\u80FD\u91CF\u6EE1\u540E\u63D0\u5347\u8F6C\u76D8\u901F\u5EA6"
+--- !u!1 &1210114481874252775
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5342005038923148952}
+  - component: {fileID: 6114669067577532137}
+  - component: {fileID: 7066539838958726911}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5342005038923148952
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210114481874252775}
+  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
+  m_Children: []
+  m_Father: {fileID: 885390037916122501}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6114669067577532137
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210114481874252775}
+  m_CullTransparentMesh: 1
+--- !u!114 &7066539838958726911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210114481874252775}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u786E\u8BA4"
+--- !u!1 &1534941537156825380
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8711521563607216961}
+  - component: {fileID: 2877494123894635728}
+  - component: {fileID: 3343915087951113016}
+  - component: {fileID: 1195188062776341003}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: next
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8711521563607216961
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1534941537156825380}
+  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
+  m_Children:
+  - {fileID: 2884431261896926098}
+  m_Father: {fileID: 1365871677352826847}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 247, y: -74}
+  m_SizeDelta: {x: 160, y: 45.22}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2877494123894635728
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1534941537156825380}
+  m_CullTransparentMesh: 1
+--- !u!114 &3343915087951113016
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1534941537156825380}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1195188062776341003
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1534941537156825380}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3343915087951113016}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &1723137605814839974
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 885390037916122501}
+  - component: {fileID: 3466757747575245234}
+  - component: {fileID: 165434195292794015}
+  - component: {fileID: 9169353974656205656}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ok
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &885390037916122501
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1723137605814839974}
+  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
+  m_Children:
+  - {fileID: 5342005038923148952}
+  m_Father: {fileID: 1365871677352826847}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -143}
+  m_SizeDelta: {x: 160, y: 45.22}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3466757747575245234
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1723137605814839974}
+  m_CullTransparentMesh: 1
+--- !u!114 &165434195292794015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1723137605814839974}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &9169353974656205656
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1723137605814839974}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 165434195292794015}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &2773087636756362309
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1365871677352826847}
+  - component: {fileID: 3460934487796755981}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: TaoismPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1365871677352826847
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2773087636756362309}
+  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
+  m_Children:
+  - {fileID: 905803480133090990}
+  - {fileID: 9184837831356523715}
+  - {fileID: 1303673304660186662}
+  - {fileID: 885390037916122501}
+  - {fileID: 8711521563607216961}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3460934487796755981
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2773087636756362309}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: massge
+    gameObject: {fileID: 7874435413531388385}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ok
+    gameObject: {fileID: 9169353974656205656}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: next
+    gameObject: {fileID: 1195188062776341003}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &5056515321732837840
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 905803480133090990}
+  - component: {fileID: 7629842749331354451}
+  - component: {fileID: 5875337332071948541}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &905803480133090990
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5056515321732837840}
+  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
+  m_Children: []
+  m_Father: {fileID: 1365871677352826847}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1000, y: 2000}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7629842749331354451
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5056515321732837840}
+  m_CullTransparentMesh: 1
+--- !u!114 &5875337332071948541
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5056515321732837840}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.48235294}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5300575210066782680
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9184837831356523715}
+  - component: {fileID: 1388834943643501276}
+  - component: {fileID: 2089456018373392205}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9184837831356523715
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5300575210066782680}
+  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
+  m_Children: []
+  m_Father: {fileID: 1365871677352826847}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 363}
+  m_SizeDelta: {x: 512, y: 512}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1388834943643501276
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5300575210066782680}
+  m_CullTransparentMesh: 1
+--- !u!114 &2089456018373392205
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5300575210066782680}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 77b8471809085b342a486f6f2ffbdb2a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+--- !u!1 &6929925740082872680
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2884431261896926098}
+  - component: {fileID: 5232173254531711776}
+  - component: {fileID: 2003525900487093672}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2884431261896926098
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6929925740082872680}
+  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
+  m_Children: []
+  m_Father: {fileID: 8711521563607216961}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5232173254531711776
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6929925740082872680}
+  m_CullTransparentMesh: 1
+--- !u!114 &2003525900487093672
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6929925740082872680}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E0B\u4E00\u4E2A"

Assets/Res/UI/TaoismPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: W3MZtSKtWikNJ6+2J9mvtztmZJQfw4JKNtlFaVwaiDVwRN/arT31mBdQz/0L
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -1745,6 +1745,42 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &396038063
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 396038064}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &396038064
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 396038063}
+  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
+  m_Children: []
+  m_Father: {fileID: 1663534287}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &442218246
 GameObject:
   m_ObjectHideFlags: 0
@@ -3304,6 +3340,11 @@ Transform:
   - {fileID: 612158947}
   m_Father: {fileID: 1902930422}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!224 &1490985506 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+  m_PrefabInstance: {fileID: 4260062870105671322}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1515802677
 GameObject:
   m_ObjectHideFlags: 0
@@ -3512,6 +3553,12 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
       insertIndex: -1
       addedObject: {fileID: 732466266}
+    - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 396038064}
+    - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1490985506}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
 --- !u!224 &1663534287 stripped
@@ -5536,6 +5583,107 @@ MonoBehaviour:
   blendDistance: 0
   weight: 1
   sharedProfile: {fileID: 11400000, guid: a024a20ca0d0cae468202914ff5e6a29, type: 2}
+--- !u!1001 &4260062870105671322
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1663534287}
+    m_Modifications:
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 750
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1624
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2773087636756362309, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_Name
+      value: TaoismPanel
+      objectReference: {fileID: 0}
+    - target: {fileID: 2773087636756362309, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
 --- !u!33 &4435033121529342098
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -5703,6 +5851,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: ZhuanPanPanel
       objectReference: {fileID: 0}
+    - target: {fileID: 2805882514726104012, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 26.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 2805882514726104012, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -1
+      objectReference: {fileID: 0}
     - target: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -76,7 +76,7 @@ public int cd;
 
 
 		/// <summary>
-		///技能类型: 1= 基础 2=增强型技能 3=法宝技能 
+		///技能类型: 1= 基础 2=增强型技能 3=法宝技能 4=大道 
 		/// </summary>
 public int SkillType;
 

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

@@ -77,5 +77,6 @@
         /// 技能槽位改变
         /// </summary>
         SkillSlotsAlter,
+        TaoismSkillAlter,
     }
 }

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

@@ -0,0 +1,14 @@
+using Core.Utility.Event;
+using GameLogic.Combat.CombatTool;
+
+namespace Common.Utility.CombatEvent
+{
+    public class TaoismSkillAlterEventData: EventDataBasic<TaoismSkillAlterEventData>
+    {
+        public CombatHeroEntity CombatHeroEntity;
+        protected override void ProDispose()
+        {
+            CombatHeroEntity = null;
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f6237e85934f44988061e3397f7d2999
+timeCreated: 1744612243

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

@@ -125,6 +125,10 @@ public class CombatHeroInfo
 
     public List<FaBaoInfo> MagicWeaponID = new List<FaBaoInfo>();
 
+    /// <summary>
+    /// 大道修炼ID
+    /// </summary>
+    public int TaoismSkillId;
     public float GetAttSpeed
     {
         get

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

@@ -32,6 +32,10 @@ namespace GameLogic.Combat.Hero
         public SkillBasic currUseSkill;
 
 
+        /// <summary>
+        /// 大道技能
+        /// </summary>
+        public SkillBasic taoismSkillBasic;
         // public float NormalAttSpeedScale;
 
 
@@ -55,6 +59,35 @@ namespace GameLogic.Combat.Hero
             {
                 await SetNewSkill(PlayerManager.Instance.GongFaControl.allUseSkill);
             }
+
+            InitTaoismSkill(_combatHeroEntity.CurrCombatHeroInfo.TaoismSkillId);
+        }
+
+        public void InitTaoismSkill(int TaoismSkillId)
+        {
+            if (taoismSkillBasic != null)
+            {
+                taoismSkillBasic.Dispose();
+            }
+
+            int id = TaoismSkillId;
+            if (id != 0)
+            {
+                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(id);
+
+                SkillBasic skillBasic = SkillScriptManager.Instance.CreateSkillBasic(skillConfig);
+                if (skillBasic == null)
+                {
+                    return;
+                }
+
+                SkillInfo skillInfo = new SkillInfo(id, 1);
+                skillBasic.InitSkillConfig(_combatHeroEntity, skillInfo);
+                taoismSkillBasic = skillBasic;
+                TaoismSkillAlterEventData taoismSkillAlterEventData = TaoismSkillAlterEventData.Create();
+                taoismSkillAlterEventData.CombatHeroEntity = _combatHeroEntity;
+                CombatEventManager.Instance.Dispatch(CombatEventType.TaoismSkillAlter, taoismSkillAlterEventData);
+            }
         }
 
         public override async CTask SetNewSkill(SkillInfo[] allSkill)
@@ -135,6 +168,11 @@ namespace GameLogic.Combat.Hero
                 float speed = _combatHeroEntity.CurrCombatHeroInfo.GetAttSpeed;
                 SkillTurntable.Update(t, 1 * speed);
             }
+
+            if (taoismSkillBasic != null)
+            {
+                taoismSkillBasic.CombatUpdate(t);
+            }
         }
 
 

Assets/Scripts/GameLogic/Combat/Skill/DS60101.cs

@@ -0,0 +1,68 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 大道技能  星辰道：每次释放功法时获得一定的能量，能量满后提升转盘速度
+    /// </summary>
+    public class DS60101 : SkillBasic
+    {
+        public float currEnergy = 0;
+
+        private float _currTime;
+        public bool _updateTime;
+
+        protected override void ProUseSkill()
+        {
+        }
+
+        protected override void ProInitSkill()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, UseSkill);
+        }
+
+        private void UseSkill(IEventData iEventData)
+        {
+            CombatUseSkillEventData combatUseSkillEventData = iEventData as CombatUseSkillEventData;
+            if (combatUseSkillEventData.useSkill.CombatHeroEntity == CombatHeroEntity)
+            {
+                currEnergy += SelfSkillConfig.effectValue[0];
+                if (currEnergy >= SelfSkillConfig.effectValue[1])
+                {
+                    _updateTime = true;
+                    _currTime = 0;
+                    currEnergy = 0;
+                    CombatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl += SelfSkillConfig.effectValue[2];
+                }
+            }
+        }
+
+        private void Finish()
+        {
+            if (_updateTime)
+            {
+                CombatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= SelfSkillConfig.effectValue[2];
+                _updateTime = false;
+            }
+        }
+
+
+        protected override void ProCombatUpdate(float time)
+        {
+            if (_updateTime)
+            {
+                _currTime += time;
+                if (_currTime >= SelfSkillConfig.effectValue[3])
+                {
+                    Finish();
+                }
+            }
+        }
+
+        protected override void ProDispose()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkill, UseSkill);
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/DS60101.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 274485ea451c4d86909833619ddbe753
+timeCreated: 1744599368

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -247,10 +247,10 @@ namespace GameLogic.Combat.Skill
         public void StartGame()
         {
             //  InitSpecialWeapon();
-            if (SelfSkillConfig.SkillType == 4 || SelfSkillConfig.SkillType == 5)
-            {
-                UseSkill();
-            }
+            // if (SelfSkillConfig.SkillType == 4 || SelfSkillConfig.SkillType == 5)
+            // {
+            //     UseSkill();
+            // }
 
 
             ProStartGame();

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -13,6 +13,7 @@ namespace GameLogic.Hero
 
         private Map<HeroAttributeType, int> attributeBlValue = new Map<HeroAttributeType, int>();
 
+        
         public HeroInfo()
         {
         }

Assets/Scripts/GameLogic/Player/GongFaControl.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
 using GameLogic.Hero;
 
 namespace GameLogic.Player
@@ -13,6 +14,8 @@ namespace GameLogic.Player
 
         public List<SkillInfo> allSkill = new List<SkillInfo>();
 
+        public int taoismSkillIndex = -1;
+
         public void AddSkillInfo(SkillInfo skillInfo)
         {
             allSkill.Add(skillInfo);
@@ -28,6 +31,14 @@ namespace GameLogic.Player
             allUseSkill[index] = null;
         }
 
+        public void SetTaoismSkillIndex(int id)
+        {
+            taoismSkillIndex = id;
+            PlayerManager.Instance.myHero.TaoismSkillId = id;
+            CombatHeroEntity combatHeroEntity = CombatController.currActiveCombat.CombatHeroController.playerHeroEntity;
+            combatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().InitTaoismSkill(id);
+        }
+
         /// <summary>
         /// 测试用
         /// </summary>

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -23,6 +23,7 @@ public class PlayerManager : Singleton<PlayerManager>
     /// </summary>
     public HeroInfo myHero;
 
+    
 
     public void Init()
     {
@@ -64,6 +65,7 @@ public class PlayerManager : Singleton<PlayerManager>
         HeroInfo heroInfo = new HeroInfo();
         heroInfo.InitHero(heroId, level);
         myHero = heroInfo;
+        myHero.TaoismSkillId = 601011;
         myHero.MagicWeaponID.Clear();
         myHero.MagicWeaponID.AddRange(FaBaoControl.FightFaBao);
     }

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

@@ -34,6 +34,11 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             guanbi.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            XiuXing.onClick.AddListener(async () =>
+            {
+                await TaoismPanel.OpenTaoismPanel();
+                UIManager.Instance.HideUIUIPanel(this);
+            });
         }
 
         public override async CTask Open()
@@ -42,7 +47,8 @@ namespace Fort23.Mono
             allKongSkill.Clear();
             UIManager.Instance.DormancyAllGComponent<SkillKongWidget>();
             UIManager.Instance.DormancyAllGComponent<SkillWidget>();
-            int[] allSkill = new[] { 10011, 20011, 11011, 12011, 13011, 5010011, 5011011, 5012011, 5013011, 5014011,5015011};
+            int[] allSkill = new[]
+                { 10011, 20011, 11011, 12011, 13011, 5010011, 5011011, 5012011, 5013011, 5014011, 5015011 };
             for (int i = 0; i < allSkill.Length; i++)
             {
                 int id = allSkill[i];
@@ -104,15 +110,15 @@ namespace Fort23.Mono
             if (!_isSelectSkill || selectSkillConfig == null)
             {
                 PlayerManager.Instance.GongFaControl.RemoveSkillInfo(skillKongWidget.index);
-              
+
                 skillKongWidget.Cleared();
                 return;
             }
 
-        
+
             skillKongWidget.SetSKill(selectSkillConfig);
-            selectSkillConfig.index= skillKongWidget.index;
-            PlayerManager.Instance.GongFaControl.allUseSkill[skillKongWidget.index]=(selectSkillConfig);
+            selectSkillConfig.index = skillKongWidget.index;
+            PlayerManager.Instance.GongFaControl.allUseSkill[skillKongWidget.index] = (selectSkillConfig);
             CloseSelect();
         }
 

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

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

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

@@ -0,0 +1,89 @@
+using System.Collections.Generic;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "TaoismPanel")]
+    public partial class TaoismPanel : UIPanel
+    {
+        private List<SkillConfig> allSkill = new List<SkillConfig>();
+        private int index;
+        private int myHeroTaoismSkillId;
+
+        public static async CTask OpenTaoismPanel()
+        {
+            TaoismPanel taoismPanel = await UIManager.Instance.LoadAndOpenPanel<TaoismPanel>(null, UILayer.Middle);
+            taoismPanel.OpenPanel();
+        }
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            ok.onClick.AddListener(Ok);
+            next.onClick.AddListener(Netx);
+        }
+
+        protected void Ok()
+        {
+            if (PlayerManager.Instance.myHero.TaoismSkillId != myHeroTaoismSkillId)
+            {
+                PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(myHeroTaoismSkillId);
+            }
+
+            UIManager.Instance.HideUIUIPanel(this);
+        }
+
+        private void Netx()
+        {
+            index++;
+            if (index >= allSkill.Count)
+            {
+                index = 0;
+            }
+
+            ShowNextSkill();
+        }
+
+        public void OpenPanel()
+        {
+            index = 0;
+            SkillConfig[] skillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>();
+            int id = PlayerManager.Instance.myHero.TaoismSkillId;
+            for (int i = 0; i < skillConfigs.Length; i++)
+            {
+                SkillConfig skillConfig = skillConfigs[i];
+                if (skillConfig.SkillType == 4)
+                {
+                    allSkill.Add(skillConfig);
+                }
+
+                if (id == skillConfig.ID)
+                {
+                    index = allSkill.Count - 1;
+                }
+            }
+
+            ShowNextSkill();
+        }
+
+        protected void ShowNextSkill()
+        {
+            SkillConfig skillConfig = allSkill[index];
+            myHeroTaoismSkillId = skillConfig.ID;
+            massge.text = skillConfig.dec;
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: B30c4H//UXP+Qlmoky5M93KERbtEUHd0znKW4OnWRmM/E/ovwPdMzdZTB8yg
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,51 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class TaoismPanel 
+	{
+	  #region 自定义数据 
+	  private Text _massge;
+	  public Text massge
+	   {
+	   get{
+	      if (_massge == null)
+	       {
+	         _massge  = GetUIUnit<Text>("massge"); 
+	       }
+	      return _massge;
+	     }
+	   }
+	  private Button _ok;
+	  public Button ok
+	   {
+	   get{
+	      if (_ok == null)
+	       {
+	         _ok  = GetUIUnit<Button>("ok"); 
+	       }
+	      return _ok;
+	     }
+	   }
+	  private Button _next;
+	  public Button next
+	   {
+	   get{
+	      if (_next == null)
+	       {
+	         _next  = GetUIUnit<Button>("next"); 
+	       }
+	      return _next;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

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

@@ -30,6 +30,7 @@ namespace Fort23.Mono
             CombatEventManager.Instance.AddEventListener(CombatEventType.ExercisesAlter, ExercisesAlter);
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdate);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.TaoismSkillAlter, TaoismSkillAlter);
         }
 
         protected override void DelEvent()
@@ -38,36 +39,39 @@ namespace Fort23.Mono
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.ExercisesAlter, ExercisesAlter);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdate);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.TaoismSkillAlter, TaoismSkillAlter);
         }
 
+
         public override void AddButtonEvent()
         {
-            lanLiang_button.onClick.AddListener(() =>
-            {
-                SkillSelectPanel.OpenSkillSelectPanel();
-            });
+            lanLiang_button.onClick.AddListener(() => { SkillSelectPanel.OpenSkillSelectPanel(); });
+        }
+
+        private void TaoismSkillAlter(IEventData iEventData)
+        {
         }
 
         private void AddUseGongFa(IEventData iEventData)
         {
             CombatHeroInfo combatHeroInfo = CombatController.currActiveCombat.CombatHeroController
                 .playerHeroEntity.CurrCombatHeroInfo;
-            jin_shangshi.text = "伤势："+combatHeroInfo.Metal_Injury;
-            mu_shangshi.text = "伤势："+combatHeroInfo.Wood_Injury;
-            shui_shangshi.text = "伤势："+combatHeroInfo.Water_Injury;
-            huo_shangshi.text = "伤势："+combatHeroInfo.Fire_Injury;
-            tu_shangshi.text = "伤势："+combatHeroInfo.Earth_Injury;
+            jin_shangshi.text = "伤势：" + combatHeroInfo.Metal_Injury;
+            mu_shangshi.text = "伤势：" + combatHeroInfo.Wood_Injury;
+            shui_shangshi.text = "伤势：" + combatHeroInfo.Water_Injury;
+            huo_shangshi.text = "伤势：" + combatHeroInfo.Fire_Injury;
+            tu_shangshi.text = "伤势：" + combatHeroInfo.Earth_Injury;
         }
 
         private void HeroHpUpdate(IEventData iEventData)
         {
             CombatHeroInfo combatHeroInfo = CombatController.currActiveCombat.CombatHeroController
                 .playerHeroEntity.CurrCombatHeroInfo;
-            jin_shangshi.text = "伤势："+combatHeroInfo.Metal_Injury;
-            mu_shangshi.text = "伤势："+combatHeroInfo.Wood_Injury;
-            shui_shangshi.text = "伤势："+combatHeroInfo.Water_Injury;
-            huo_shangshi.text = "伤势："+combatHeroInfo.Fire_Injury;
-            tu_shangshi.text = "伤势："+combatHeroInfo.Earth_Injury;
+            jin_shangshi.text = "伤势：" + combatHeroInfo.Metal_Injury;
+            mu_shangshi.text = "伤势：" + combatHeroInfo.Wood_Injury;
+            shui_shangshi.text = "伤势：" + combatHeroInfo.Water_Injury;
+            huo_shangshi.text = "伤势：" + combatHeroInfo.Fire_Injury;
+            tu_shangshi.text = "伤势：" + combatHeroInfo.Earth_Injury;
         }
 
         private async void ExercisesAlter(IEventData iEventData)
@@ -106,6 +110,19 @@ namespace Fort23.Mono
             CombatHeroSkillControl combatHeroSkillControl = CombatController.currActiveCombat.CombatHeroController
                 .playerHeroEntity.CombatHeroSkillControl
                 .This<CombatHeroSkillControl>();
+
+            if (combatHeroSkillControl.taoismSkillBasic != null)
+            {
+                DS60101 ds60101 = combatHeroSkillControl.taoismSkillBasic as DS60101;
+                if (ds60101 != null)
+                {
+                    lanLiang.fillAmount = ds60101.currEnergy / ds60101.SelfSkillConfig.effectValue[1];
+                    lanLiang.color = !ds60101._updateTime
+                        ? new Color(1f, 0.96f, 0f)
+                        : new Color(0.96f, 0f, 1f);
+                }
+            }
+
             // lanLiang.fillAmount = combatHeroSkillControl.addChongNeng / 150f;
             // lanLiang.color = !combatHeroSkillControl.isKuoLiQuanKai
             //     ? new Color(1f, 0.96f, 0f)
@@ -113,14 +130,6 @@ namespace Fort23.Mono
             for (int i = 0; i < _gfWidgets.Count; i++)
             {
                 gf_widget gfWidget = _gfWidgets[i];
-                // gfWidget.SkillBasic.angle += 1;
-                // float jd = gfWidget.SkillBasic.angle % 360;
-                // if (jd > gfWidget.SkillBasic.useAngle && gfWidget.SkillBasic.angle > gfWidget.SkillBasic.lasetAngle)
-                // {
-                //     gfWidget.SkillBasic.lasetAngle += 360;
-                //     Debug.Log("旋转一圈");
-                // }
-
                 if (gfWidget.useCount != gfWidget.SkillBasic.useCount)
                 {
                     gfWidget.useCount = gfWidget.SkillBasic.useCount;

UserSettings/Layouts/default-2022.dwlt

@@ -43,8 +43,8 @@ MonoBehaviour:
     y: 743
     width: 711
     height: 233
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -149,8 +149,8 @@ MonoBehaviour:
     y: 0
     width: 716
     height: 1299
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -274,8 +274,8 @@ MonoBehaviour:
     y: 0
     width: 549
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -300,8 +300,8 @@ MonoBehaviour:
     y: 0
     width: 711
     height: 743
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -423,7 +423,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 60d4fbff7cd4fbff80d4fbff8ad4fbff78faffff
+      m_ExpandedIDs: e425faffea25faffa026faffb027faffb427faffbe27faff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -539,7 +539,7 @@ MonoBehaviour:
     m_SkipHidden: 1
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameLogic/Combat/Hero
+    - Assets/Scripts/GameStart
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -547,16 +547,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameLogic/Combat/Hero
+  - Assets/Scripts/GameStart
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 486}
-    m_SelectedIDs: 74b90000
-    m_LastClickedID: 47476
-    m_ExpandedIDs: 000000007cb800007eb8000080b8000082b8000084b8000086b8000088b800008ab800008cb800008eb8000090b8000092b8000094b8000096b8000098b800009ab800004ab9000062b9000074b9000000ca9a3bffffff7f
+    m_SelectedIDs: 88b90000
+    m_LastClickedID: 47496
+    m_ExpandedIDs: 0000000080b8000082b8000084b8000086b8000088b800008ab800008cb800008eb8000090b8000092b8000094b8000096b8000098b800009ab800009cb800009eb800004eb9000066b9000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -584,7 +584,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000007cb800007eb8000080b8000082b8000084b8000086b8000088b800008ab800008cb800008eb8000090b8000092b8000094b8000096b8000098b800009ab80000
+    m_ExpandedIDs: 0000000080b8000082b8000084b8000086b8000088b800008ab800008cb800008eb8000090b8000092b8000094b8000096b8000098b800009ab800009cb800009eb80000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -636,7 +636,7 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 96.5}
+    m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 1
   m_DirectoriesAreaWidth: 318
@@ -1133,9 +1133,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0, y: -1.21, z: 0}
+    m_Target: {x: -0.009236453, y: -2.6887317, z: 0}
     speed: 2
-    m_Value: {x: 0, y: -1.21, z: 0}
+    m_Value: {x: -0.009236453, y: -2.6887317, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1181,13 +1181,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.038943022, y: -0.10537273, z: 0.0055762446, w: -0.99398065}
+    m_Target: {x: 0.018193046, y: -0.9686573, z: -0.06776765, w: -0.23964164}
     speed: 2
-    m_Value: {x: -0.038930397, y: -0.10533857, z: 0.005574437, w: -0.9936584}
+    m_Value: {x: 0.018187148, y: -0.9683433, z: -0.067745686, w: -0.23956396}
   m_Size:
-    m_Target: 1.0792253
+    m_Target: 0.17483255
     speed: 2
-    m_Value: 1.0792253
+    m_Value: 0.17483255
   m_Ortho:
     m_Target: 0
     speed: 2