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

# Conflicts:
#	Excel2Json/Excel/EventConfig.xlsx   resolved by master version

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

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

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

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

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

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

Assets/Res/Config/EventLinkConfig.json

@@ -23530,10 +23530,7 @@
       "EventID": 9156,
       "step": 10,
       "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        915611
-      ]
+      "ResultType": 0
     },
     {
       "ID": 915611,

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -4860,6 +4860,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1163035806332343457}
+  - {fileID: 3135622044841296425}
+  - {fileID: 3648608485061785242}
   - {fileID: 2849870254427059589}
   - {fileID: 4201003859133084461}
   - {fileID: 1774812024264171205}
@@ -5119,6 +5122,21 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: fx_ui_gf_fz_loop
+    gameObject: {fileID: 5687247290041578047}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: fx_ui_gf_fz_xian_loop
+    gameObject: {fileID: 662021963056595906}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: fx_ui_gf_fangzhi_loop
+    gameObject: {fileID: 7536118278410949028}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5280469173278725104
 GameObject:
@@ -7562,3 +7580,454 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1001 &4131293543597701602
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 8031870718418499362}
+    m_Modifications:
+    - target: {fileID: 1121024677785187744, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.63391775
+      objectReference: {fileID: 0}
+    - target: {fileID: 1121024677785187744, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.63391775
+      objectReference: {fileID: 0}
+    - target: {fileID: 1121024677785187744, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.31328633
+      objectReference: {fileID: 0}
+    - target: {fileID: 1121024677785187744, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.31328633
+      objectReference: {fileID: 0}
+    - target: {fileID: 1121024677785187744, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -217.40201
+      objectReference: {fileID: 0}
+    - target: {fileID: 1333474015089251198, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1333474015089251198, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3493303340052232736, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_gf_fz_xian_loop
+      objectReference: {fileID: 0}
+    - target: {fileID: 3493303340052232736, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7316734461190345246, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7316734461190345246, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+--- !u!1 &662021963056595906 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3493303340052232736, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+  m_PrefabInstance: {fileID: 4131293543597701602}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &3135622044841296425 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
+  m_PrefabInstance: {fileID: 4131293543597701602}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7547607250917142542
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 8031870718418499362}
+    m_Modifications:
+    - target: {fileID: 2327947066608689623, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2327947066608689623, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2523165358447521813, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_gf_fz_loop
+      objectReference: {fileID: 0}
+    - target: {fileID: 2523165358447521813, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3346237575278564810, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3346237575278564810, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676122955387368977, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676122955387368977, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+--- !u!224 &3648608485061785242 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6493076686723171988, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+  m_PrefabInstance: {fileID: 7547607250917142542}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5687247290041578047 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2761645045280866865, guid: 7e27511ea2e992c43889cd7c06483f99, type: 3}
+  m_PrefabInstance: {fileID: 7547607250917142542}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1001 &8809657697632844294
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 8031870718418499362}
+    m_Modifications:
+    - target: {fileID: 1357723848118872994, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_gf_fangzhi_loop
+      objectReference: {fileID: 0}
+    - target: {fileID: 1357723848118872994, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687756290623300039, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687756290623300039, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7409172258289669550, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7409172258289669550, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -2.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 1.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a010297026d18724c81494bc5c69b747, type: 3}
+--- !u!224 &1163035806332343457 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7665654226094075559, guid: a010297026d18724c81494bc5c69b747, type: 3}
+  m_PrefabInstance: {fileID: 8809657697632844294}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &7536118278410949028 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1357723848118872994, guid: a010297026d18724c81494bc5c69b747, type: 3}
+  m_PrefabInstance: {fileID: 8809657697632844294}
+  m_PrefabAsset: {fileID: 0}

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -61,7 +61,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         EventManager.Instance.AddEventListener(CustomEventType.DetectRandomEvent, RenfenceRandomEvent);
-        EventManager.Instance.AddEventListener(CustomEventType.AddItem, ItemUpdate);
+        EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdate);
         EventManager.Instance.AddEventListener(CustomEventType.JingJieUpgrade, JingJieUpgrade);
         EventManager.Instance.AddEventListener(CustomEventType.CancelEvent, Cancel);
     }
@@ -777,7 +777,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CurrentEventList = evt;
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, async() =>
+        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, async () =>
         {
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(CurrentEventList.eventID);
             if (eventConfig.EventTriggerType != 4)
@@ -796,7 +796,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
                     UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
                 }
-     
+
                 EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
             }
 
@@ -852,6 +852,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventConditionConfig eventConditionConfig =
             ConfigComponent.Instance.Get<EventConditionConfig>(eventCondition.eventCondition);
 
+
         if (eventCondition != null)
         {
             return eventCondition.fishCount >= eventConditionConfig.finishCount;
@@ -930,7 +931,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             ConfigComponent.Instance.Get<EventConditionConfig>(conditionData.eventCondition);
 
 
-        if (IsEvenkLinkComplete(conditionData))
+        if (IsEvenkLinkComplete(conditionData) && eventConditionConfig.ConditionType != 1)
             return;
 
         switch (type)
@@ -1285,7 +1286,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
         if (eventConfig.EventTriggerType == 4)
         {
-          
             await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
         }

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

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using Coffee.UIExtensions;
+
 namespace Fort23.Mono
 {
 	public partial class SkillKongWidget 
@@ -74,6 +76,39 @@ namespace Fort23.Mono
 	      return _Icon_YingXiang;
 	     }
 	   }
+	  private UIParticle _fx_ui_gf_fz_loop;
+	  public UIParticle fx_ui_gf_fz_loop
+	   {
+	   get{
+	      if (_fx_ui_gf_fz_loop == null)
+	       {
+	         _fx_ui_gf_fz_loop  = GetUIUnit<UIParticle>("fx_ui_gf_fz_loop"); 
+	       }
+	      return _fx_ui_gf_fz_loop;
+	     }
+	   }
+	  private GameObject _fx_ui_gf_fz_xian_loop;
+	  public GameObject fx_ui_gf_fz_xian_loop
+	   {
+	   get{
+	      if (_fx_ui_gf_fz_xian_loop == null)
+	       {
+	         _fx_ui_gf_fz_xian_loop  = GetUIUnit<GameObject>("fx_ui_gf_fz_xian_loop"); 
+	       }
+	      return _fx_ui_gf_fz_xian_loop;
+	     }
+	   }
+	  private GameObject _fx_ui_gf_fangzhi_loop;
+	  public GameObject fx_ui_gf_fangzhi_loop
+	   {
+	   get{
+	      if (_fx_ui_gf_fangzhi_loop == null)
+	       {
+	         _fx_ui_gf_fangzhi_loop  = GetUIUnit<GameObject>("fx_ui_gf_fangzhi_loop"); 
+	       }
+	      return _fx_ui_gf_fangzhi_loop;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -581,7 +581,7 @@ namespace Fort23.Mono
             new List<int>() { 9, 8, 7 }, //金
             new List<int>() { 1, 0, 9 }, //木
             new List<int>() { 7, 6, 5 }, //水
-          
+
             new List<int>() { 5, 4, 3 }, //火
             new List<int>() { 7, 6, 5 }, //土
             new List<int>() { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, //辅助
@@ -959,6 +959,8 @@ namespace Fort23.Mono
 
         private bool IsCurrentPosUse(SkillInfo skillConfig, SkillKongWidget skillKongWidget)
         {
+            return true;
+
             if (PlayerManager.Instance.myHero.level > 60)
             {
                 return true;
@@ -1010,57 +1012,54 @@ namespace Fort23.Mono
             for (int i = 0; i < allKongSkill.Count; i++)
             {
                 allKongSkill[i].SelectState(false);
+                allKongSkill[i].fx_ui_gf_fangzhi_loop.gameObject.SetActive(false);
             }
 
-
-            if (!max)
+            int index = 5;
+            if (PlayerManager.Instance.myHero.level <= 60)
             {
-                int index = 5;
-                if (PlayerManager.Instance.myHero.level <= 60)
+                //金
+                if (skillConfig.skillConfig.attribute == 1)
                 {
-                    //金
-                    if (skillConfig.skillConfig.attribute == 1)
-                    {
-                        index = 0;
-                    }
-
-                    //木
-                    if (skillConfig.skillConfig.attribute == 2)
-                    {
-                        index = 1;
-                    }
+                    index = 0;
+                }
 
-                    //水
-                    if (skillConfig.skillConfig.attribute == 4)
-                    {
-                        index = 2;
-                    }
+                //木
+                if (skillConfig.skillConfig.attribute == 2)
+                {
+                    index = 1;
+                }
 
-                    //火
-                    if (skillConfig.skillConfig.attribute == 8)
-                    {
-                        index = 3;
-                    }
+                //水
+                if (skillConfig.skillConfig.attribute == 4)
+                {
+                    index = 2;
+                }
 
-                    //土
-                    if (skillConfig.skillConfig.attribute == 16)
-                    {
-                        index = 4;
-                    }
+                //火
+                if (skillConfig.skillConfig.attribute == 8)
+                {
+                    index = 3;
                 }
 
+                //土
+                if (skillConfig.skillConfig.attribute == 16)
+                {
+                    index = 4;
+                }
+            }
 
-                // //辅助
-                // if (skillConfig.skillConfig.attribute == 0)
-                //
-                //     index = 5;
-                // }
+            if (!max)
+            {
+                for (var i = 0; i < allKongSkill.Count; i++)
+                {
+                    allKongSkill[i].SelectState(true);
+                }
 
 
-                //先上对应位置
                 foreach (var i in indexList[index])
                 {
-                    allKongSkill[i].SelectState(true);
+                    allKongSkill[i].fx_ui_gf_fangzhi_loop.gameObject.SetActive(true);
                 }
 
 
@@ -1161,7 +1160,13 @@ namespace Fort23.Mono
                     if (allKongSkill[i].SkillInfo != null)
                     {
                         if (selectSkillConfig.skillConfig.SkillType == allKongSkill[i].SkillInfo.skillConfig.SkillType)
+                        {
                             allKongSkill[i].SelectState(true);
+                            if (indexList[index].Contains(allKongSkill[i].index))
+                            {
+                                allKongSkill[i].fx_ui_gf_fangzhi_loop.gameObject.SetActive(true);
+                            }
+                        }
                     }
                 }
             }
@@ -1184,6 +1189,7 @@ namespace Fort23.Mono
             for (int i = 0; i < allKongSkill.Count; i++)
             {
                 allKongSkill[i].SelectState(false);
+                allKongSkill[i].fx_ui_gf_fangzhi_loop.gameObject.SetActive(false);
             }
 
             ChangeFuZhuYingXiang();
@@ -1193,9 +1199,16 @@ namespace Fort23.Mono
         {
             yingxiang.Clear();
             float addcd = 0;
+
             for (int i = 0; i < allKongSkill.Count; i++)
             {
-                allKongSkill[i].Icon_YingXiang.gameObject.SetActive(false);
+                allKongSkill[i].fx_ui_gf_fz_loop.gameObject.SetActive(false);
+                allKongSkill[i].fx_ui_gf_fz_xian_loop.gameObject.SetActive(false);
+            }
+
+            for (int i = 0; i < allKongSkill.Count; i++)
+            {
+                // allKongSkill[i].fx_ui_gf_fz_loop.gameObject.SetActive(false);
                 if (allKongSkill[i].SkillInfo != null)
                 {
                     addcd += allKongSkill[i].SkillInfo.skillConfig.addcd;
@@ -1204,6 +1217,8 @@ namespace Fort23.Mono
                 if (allKongSkill[i].SkillInfo != null && allKongSkill[i].SkillInfo.skillConfig.SkillType == 2 &&
                     allKongSkill[i].SkillInfo.skillConfig.PromoteLanPara_1 != null)
                 {
+                    allKongSkill[i].fx_ui_gf_fz_loop.gameObject.SetActive(true);
+                    allKongSkill[i].fx_ui_gf_fz_loop.Play();
                     foreach (var f in allKongSkill[i].SkillInfo.skillConfig.PromoteLanPara_1)
                     {
                         if (f != 0)
@@ -1211,9 +1226,47 @@ namespace Fort23.Mono
                             var nubs = GetNumbers(i, f);
                             foreach (var nub in nubs)
                             {
-                                if (!yingxiang.Contains(nub))
+                                // if (!yingxiang.Contains(nub))
+                                // {
+                                //     yingxiang.Add(nub);
+                                // }
+
+                                allKongSkill[nub].fx_ui_gf_fz_loop.gameObject.SetActive(true);
+                                allKongSkill[nub].fx_ui_gf_fz_loop.Play();
+                                if (allKongSkill[nub].SkillInfo != null)
                                 {
-                                    yingxiang.Add(nub);
+                                    //左边
+                                    if (f == -1)
+                                    {
+                                        // 计算从A指向B的向量
+                                        Vector2 direction = allKongSkill[nub].transform.position -
+                                                            allKongSkill[i].transform.position;
+
+                                        float angleRad = Mathf.Atan2(direction.y, direction.x);
+
+
+                                        float angleDeg = angleRad * Mathf.Rad2Deg;
+
+
+                                        allKongSkill[nub].fx_ui_gf_fz_xian_loop.transform.rotation =
+                                            Quaternion.Euler(0, 0, angleDeg + 20);
+                                        allKongSkill[nub].fx_ui_gf_fz_xian_loop.gameObject.SetActive(true);
+                                        // LogTool.Error($"角度：{angleDeg}");
+                                    }
+                                    else
+                                    {
+                                        // 计算从A指向B的向量
+                                        Vector2 direction = allKongSkill[i].transform.position -
+                                                            allKongSkill[nub].transform.position;
+
+                                        float angleRad = Mathf.Atan2(direction.y, direction.x);
+
+
+                                        float angleDeg = angleRad * Mathf.Rad2Deg;
+                                        allKongSkill[i].fx_ui_gf_fz_xian_loop.transform.rotation =
+                                            Quaternion.Euler(0, 0, angleDeg + 20);
+                                        allKongSkill[i].fx_ui_gf_fz_xian_loop.gameObject.SetActive(true);
+                                    }
                                 }
                             }
                         }
@@ -1221,10 +1274,11 @@ namespace Fort23.Mono
                 }
             }
 
-            foreach (var i in yingxiang)
-            {
-                allKongSkill[i].Icon_YingXiang.gameObject.SetActive(true);
-            }
+            // foreach (var i in yingxiang)
+            // {
+            //     allKongSkill[i].fx_ui_gf_fz_loop.gameObject.SetActive(true);
+            //     allKongSkill[i].fx_ui_gf_fz_loop.Play();
+            // }
 
             Text_Cd.text = LanguageManager.Instance.Text(10208,
                 ((PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum *

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

@@ -326,16 +326,20 @@ namespace Fort23.Mono
                                     LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[2]);
 
 
-            LevelbattleConfig levelbattleConfig =
-                ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
-            GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
-            HeroModelConfig heroModelConfig =
-                ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
-            MonsterPowerUpConfig monsterPowerUpConfig =
-                ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
-
-            Text_CombatTitle.text =
-                $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
+            if (heroPowerUpConfig.DujieLevelbattleID != -1)
+            {
+                LevelbattleConfig levelbattleConfig =
+                    ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
+                GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
+                HeroModelConfig heroModelConfig =
+                    ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
+                MonsterPowerUpConfig monsterPowerUpConfig =
+                    ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+
+                Text_CombatTitle.text =
+                    $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
+            }
+
 
             if (heroPowerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
             {