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

# Conflicts:
#	Assets/Res/Config/SentimentEffectConfig.json   resolved by origin/master(远端) version
#	Assets/Scripts/GameData/ExcelConfig/SentimentEffectConfig.cs   resolved by origin/master(远端) version

Assets/Art/HeroTimeLine/fb_wulonglunTimeline.playable

@@ -26,6 +26,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: pengpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -37,6 +47,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-9151128744060106284
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -340,6 +352,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 1
@@ -351,6 +373,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-7990616991488039303
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -855,7 +879,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -4549963630819176586}
-    m_Duration: 0.3333333333333333
+    m_Duration: 0.33736237542082864
     m_TimeScale: 1
     m_ParentTrack: {fileID: -6683161270338213082}
     m_EaseInDuration: 0
@@ -1095,6 +1119,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: -6338035570506245065}
+  - {fileID: 8923605439703958715}
   - {fileID: 212739854551984720}
   - {fileID: -7544242966777951075}
   - {fileID: -2583586318041871126}
@@ -1617,6 +1642,16 @@ MonoBehaviour:
   targetType: 2
   LocationType: 6
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -1628,6 +1663,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-3132860492426191746
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1793,6 +1830,7 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: 1501360367786949402}
+  - {fileID: 5891973575608840055}
   - {fileID: -4166708294884011128}
   m_Clips: []
   m_Markers:
@@ -1871,6 +1909,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -1882,6 +1930,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-1196483264028893044
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1932,6 +1982,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -1943,6 +2003,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2140,7 +2202,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -1317467783677806590}
-    m_Duration: 1
+    m_Duration: 0.3333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: 1501360367786949402}
     m_EaseInDuration: 0
@@ -2616,6 +2678,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: pengpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2627,6 +2699,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &5110619295240876175
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2782,6 +2856,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2793,6 +2877,101 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
+--- !u!114 &5891973575608840055
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -2327424553049336028}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 7700549132768678106}
+    m_Duration: 0.3333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 5891973575608840055}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &6066816933775845479
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2866,6 +3045,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2877,6 +3066,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &6402728653791148440
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2903,6 +3094,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 1
@@ -2914,6 +3115,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &6585205517704036416
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2940,6 +3143,16 @@ MonoBehaviour:
   targetType: 2
   LocationType: 6
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2951,6 +3164,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &6868245914243662454
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3058,3 +3273,120 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   showPointType: 1
   customizePointName: hitpos2
+--- !u!114 &7700549132768678106
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+--- !u!114 &8093587624043643128
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
+  m_EditorClassIdentifier: 
+--- !u!114 &8923605439703958715
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -5875317742908195551}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 8093587624043643128}
+    m_Duration: 0.3
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 8923605439703958715}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3

Assets/Res/Config/FabaoConfig.json

@@ -18,6 +18,24 @@
       ],
       "SkillGroupID": 3101
     },
+    {
+      "ID": 10002,
+      "ItemID": 10002,
+      "name": "噬空齿刃",
+      "Type": 1,
+      "magicAttribute": 1,
+      "model": "fb_wulonglun",
+      "fragmentID": 11002,
+      "ShuxingIDs": [
+        1,
+        3
+      ],
+      "ShuxingPara": [
+        50,
+        50
+      ],
+      "SkillGroupID": 3102
+    },
     {
       "ID": 10003,
       "ItemID": 10003,
@@ -62,6 +80,14 @@
       "magicAttribute": 2,
       "model": "fb_3203",
       "fragmentID": 11005,
+      "ShuxingIDs": [
+        2,
+        3
+      ],
+      "ShuxingPara": [
+        50,
+        50
+      ],
       "SkillGroupID": 3203
     },
     {
@@ -90,6 +116,14 @@
       "magicAttribute": 4,
       "model": "fb_3302",
       "fragmentID": 11007,
+      "ShuxingIDs": [
+        1,
+        2
+      ],
+      "ShuxingPara": [
+        75,
+        25
+      ],
       "SkillGroupID": 3302
     },
     {

Assets/Res/Config/SkillConfig.json

@@ -5871,6 +5871,144 @@
       ],
       "PromoteLan": 1269
     },
+    {
+      "ID": 31020,
+      "PieceID": 11005,
+      "power": 100.0,
+      "name": 502,
+      "dec": 925,
+      "attribute": 1,
+      "icon": "icon_s3102",
+      "scriptName": "S3102",
+      "IDGroup": 3102,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 1,
+      "effectValue": [
+        200.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": -1
+    },
+    {
+      "ID": 31021,
+      "PieceID": 11005,
+      "power": 150.0,
+      "name": 503,
+      "dec": 926,
+      "attribute": 1,
+      "icon": "icon_s3102",
+      "scriptName": "S3102",
+      "IDGroup": 3102,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 2,
+      "effectValue": [
+        220.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1270
+    },
+    {
+      "ID": 31022,
+      "PieceID": 11005,
+      "power": 225.0,
+      "name": 504,
+      "dec": 927,
+      "attribute": 1,
+      "icon": "icon_s3102",
+      "scriptName": "S3102",
+      "IDGroup": 3102,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 3,
+      "effectValue": [
+        240.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1271
+    },
+    {
+      "ID": 31023,
+      "PieceID": 11005,
+      "power": 337.5,
+      "name": 505,
+      "dec": 928,
+      "attribute": 1,
+      "icon": "icon_s3102",
+      "scriptName": "S3102",
+      "IDGroup": 3102,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 4,
+      "effectValue": [
+        260.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1272
+    },
+    {
+      "ID": 31024,
+      "PieceID": 11005,
+      "power": 506.25,
+      "name": 506,
+      "dec": 929,
+      "attribute": 1,
+      "icon": "icon_s3102",
+      "scriptName": "S3102",
+      "IDGroup": 3102,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 5,
+      "effectValue": [
+        280.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1273
+    },
+    {
+      "ID": 31025,
+      "PieceID": 11005,
+      "power": 759.375,
+      "name": 507,
+      "dec": 930,
+      "attribute": 1,
+      "icon": "icon_s3102",
+      "scriptName": "S3102",
+      "IDGroup": 3102,
+      "timelineName": "",
+      "cd": 80.0,
+      "addcd": 1.0,
+      "SkillType": 3,
+      "level": 6,
+      "effectValue": [
+        300.0
+      ],
+      "intensifierIndex": [
+        1
+      ],
+      "PromoteLan": 1274
+    },
     {
       "ID": 32010,
       "PieceID": 11002,

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -136,6 +136,51 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1213510504060186232
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3003727939372600236}
+  - component: {fileID: 6255254473757966786}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: XianRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3003727939372600236
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1213510504060186232}
+  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: 5355338081498464365}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 690, y: 1082}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6255254473757966786
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1213510504060186232}
+  m_CullTransparentMesh: 1
 --- !u!1 &1256996740201335001
 GameObject:
   m_ObjectHideFlags: 0
@@ -245,17 +290,18 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 3003727939372600236}
   - {fileID: 3651673096014695874}
   - {fileID: 4730272705645730995}
   - {fileID: 5901101323936336534}
   - {fileID: 6685742129767991100}
   m_Father: {fileID: 4796745246236082143}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -570.3065, y: 0}
-  m_Pivot: {x: 0, y: 1}
+  m_SizeDelta: {x: 689.3, y: 1082.6211}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &1979970940742213357
 GameObject:
   m_ObjectHideFlags: 0
@@ -1108,7 +1154,7 @@ GameObject:
   - component: {fileID: 4730272705645730995}
   - component: {fileID: 6450963123599502301}
   - component: {fileID: 5440543341865339941}
-  - component: {fileID: 7321256549119073876}
+  - component: {fileID: 1164238090103145722}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Root1
@@ -1127,13 +1173,13 @@ RectTransform:
   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_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 5355338081498464365}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 270, y: -344}
+  m_AnchoredPosition: {x: -23.660095, y: -344}
   m_SizeDelta: {x: 0, y: 120.181}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6450963123599502301
@@ -1158,7 +1204,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
---- !u!114 &7321256549119073876
+--- !u!114 &1164238090103145722
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1167,7 +1213,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 6901206084516032637}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
@@ -1176,14 +1222,12 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 89.26
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
+  m_StartCorner: 1
+  m_StartAxis: 0
+  m_CellSize: {x: 130, y: 130}
+  m_Spacing: {x: 100.48, y: 0}
+  m_Constraint: 1
+  m_ConstraintCount: 3
 --- !u!1 &7111277064813612592
 GameObject:
   m_ObjectHideFlags: 0
@@ -1195,7 +1239,7 @@ GameObject:
   - component: {fileID: 6685742129767991100}
   - component: {fileID: 25202101362294680}
   - component: {fileID: 3851171568439300906}
-  - component: {fileID: 7838019019951094565}
+  - component: {fileID: 1220815986512987995}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Root3
@@ -1214,13 +1258,13 @@ RectTransform:
   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_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 5355338081498464365}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 270, y: -842}
+  m_AnchoredPosition: {x: -23.660095, y: -842}
   m_SizeDelta: {x: 0, y: 120.181}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &25202101362294680
@@ -1245,7 +1289,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
---- !u!114 &7838019019951094565
+--- !u!114 &1220815986512987995
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1254,7 +1298,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7111277064813612592}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
@@ -1263,14 +1307,12 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 89.26
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
+  m_StartCorner: 1
+  m_StartAxis: 0
+  m_CellSize: {x: 130, y: 130}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 1
+  m_ConstraintCount: 3
 --- !u!1 &7881913867437123834
 GameObject:
   m_ObjectHideFlags: 0
@@ -1282,7 +1324,7 @@ GameObject:
   - component: {fileID: 5901101323936336534}
   - component: {fileID: 8662975098024751473}
   - component: {fileID: 5018905428272382041}
-  - component: {fileID: 4049258922655219337}
+  - component: {fileID: 7173247155298794253}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Root2
@@ -1301,13 +1343,13 @@ RectTransform:
   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_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 5355338081498464365}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 270, y: -593}
+  m_AnchoredPosition: {x: -23.660095, y: -593}
   m_SizeDelta: {x: 0, y: 120.181}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8662975098024751473
@@ -1332,7 +1374,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
---- !u!114 &4049258922655219337
+--- !u!114 &7173247155298794253
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1341,7 +1383,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7881913867437123834}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
@@ -1350,14 +1392,12 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 89.26
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
+  m_StartCorner: 1
+  m_StartAxis: 0
+  m_CellSize: {x: 130, y: 130}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 1
+  m_ConstraintCount: 3
 --- !u!1 &7893248989412750683
 GameObject:
   m_ObjectHideFlags: 0
@@ -1680,6 +1720,14 @@ MonoBehaviour:
     - gameObject: {fileID: 4730272705645730995}
     - gameObject: {fileID: 5901101323936336534}
     - gameObject: {fileID: 6685742129767991100}
+  - key: XianRoot
+    gameObject: {fileID: 3003727939372600236}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 4730272705645730995}
+    - gameObject: {fileID: 5901101323936336534}
+    - gameObject: {fileID: 6685742129767991100}
   isAssetBundle: 1
 --- !u!1001 &6883880457042837264
 PrefabInstance:
@@ -1711,7 +1759,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1719,7 +1767,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1759,7 +1807,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 276.66006
+      value: -17
       objectReference: {fileID: 0}
     - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_AnchoredPosition.y

Assets/Res/UI/SentimentPanel/SentimentXianWidget.prefab

@@ -0,0 +1,106 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &4353551468588870654
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7106282691229140153}
+  - component: {fileID: 3870037779896144337}
+  - component: {fileID: 8531319431003268402}
+  - component: {fileID: 5661247425326398908}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SentimentXianWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7106282691229140153
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4353551468588870654}
+  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: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -28, y: -135}
+  m_SizeDelta: {x: 8.0772, y: 247}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3870037779896144337
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4353551468588870654}
+  m_CullTransparentMesh: 1
+--- !u!114 &8531319431003268402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4353551468588870654}
+  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: 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
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &5661247425326398908
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4353551468588870654}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data: []
+  isAssetBundle: 1

Assets/Res/UI/SentimentPanel/SentimentXianWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WixNtX78BnwHxXJHqEt2ORo4CCK8SOAg3spOP/z5K1soHY6ykIclu7SXLPge
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -2246,7 +2246,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
@@ -2374,7 +2374,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10008
+      value: 10002
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameData/ExcelConfig/SentimentEffectConfig.cs

@@ -50,6 +50,18 @@ public string icon;
 public int massge;
 
 
+		/// <summary>
+		///位置
+		/// </summary>
+public int pos;
+
+
+		/// <summary>
+		///前置条件 （-1是主属性）
+		/// </summary>
+public int lastSentimentEffectId;
+
+
 		/// <summary>
 		///见条件类型表
 		/// </summary>

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -58,7 +58,8 @@ namespace GameLogic.Combat.CombatState
                 _nextMonsterTime -= t;
             
                 if (_nextMonsterTime < 0)
-                {   _nextMonsterTime = Random.Range(5, 10);
+                {  
+                    _nextMonsterTime = Random.Range(PlayerManager.Instance.gameConstantConfig.GuajiCD[0], PlayerManager.Instance.gameConstantConfig.GuajiCD[1]);
                    // EventSystemManager.Instance.DetectRandomEvents();
                    EventManager.Instance.Dispatch(CustomEventType.DetectRandomEvent,null);
                 }

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3102.cs

@@ -0,0 +1,68 @@
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill.MagicSkill
+{
+    /// <summary>
+    /// 噬空齿刃
+    /// </summary>
+    public class S3102: MagicSkillBasic
+    {
+        private CombatHeroEntity target;
+
+        protected override void ProMagicUseSkill()
+        {
+            // StraightLineShow straightLineShow = new StraightLineShow();
+            // straightLineShow.Init(this);
+            CombatHeroEntity[] allHero =
+                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
+            if (allHero == null || allHero.Length <= 0)
+            {
+                SkillPlayFinish();
+                return;
+            }
+
+            target = allHero[0];
+            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(allHero[0], Finish);
+
+            SetMagicAttShowBasic(magicAttShowBasic);
+        }
+
+        protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
+            TimeLineEventLogicBasic timeLineEventLogicBasic)
+        {
+            ILifetCycleHitPoint[] lifetCycleHitPoints = new ILifetCycleHitPoint[1];
+            lifetCycleHitPoints[0] = target.GetMainHotPoin<ILifetCycleHitPoint>();
+            return lifetCycleHitPoints;
+        }
+
+        private void Finish()
+        {
+          
+
+            // 
+            Debug.Log("法宝对敌人照成伤害");
+            ILifetCycleHitPoint lifetCycleHitPoint = target.GetMainHotPoin<ILifetCycleHitPoint>();
+            if (lifetCycleHitPoint == null)
+            {
+                SkillPlayFinish();
+                return;
+            }
+
+            BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
+            cBetterList.Add(lifetCycleHitPoint);
+            ActivationTimeLineData("gongji", currTarget: cBetterList);
+            SkillPlayFinish();
+
+    
+            long att = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.attack.Value;
+            long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(att, effectValue[0]);
+            CombatCalculateTool.Instance.Harm(CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity,
+                lifetCycleHitPoint as CombatHeroHitPoint, harm, AttType.FaBao, triggerData, wuXingType, null,
+                HarmType.Default);
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3102.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 834c56c9a096430c9dcdafb34091d8d5
+timeCreated: 1751618328

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

@@ -1,6 +1,7 @@
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -9,7 +10,9 @@ namespace Fort23.Mono
     {
         public AccountFileInfo.SentimentProperty sentimentProperty;
 
-        SentimentEffectConfig sentimentEffectConfig;
+        public SentimentEffectConfig sentimentEffectConfig;
+
+        private SentimentEffectWidget lastSentimentWidget;
 
         private void Init()
         {
@@ -44,5 +47,39 @@ namespace Fort23.Mono
                 Text_Level.text = "lv." + level;
             }
         }
+
+        public async void CreatXian(RectTransform root, SentimentEffectWidget lastSentimentWidget)
+        {
+            this.lastSentimentWidget = lastSentimentWidget;
+
+
+            // Vector2 localPointA = root.worldToLocalMatrix * lastSentimentWidget.own.transform.position;
+            // Vector2 localPointB = root.worldToLocalMatrix * transform.position;
+
+            // SentimentXianWidget sentimentXianWidget = await UIManager.Instance.CreateGComponent<SentimentXianWidget>(null, root);
+            // sentimentXianWidget.own.name = lastSentimentWidget.sentimentEffectConfig.groupId.ToString();
+            //
+            //
+            // sentimentXianWidget.transform.anchoredPosition = localPointB;
+          
+            
+            
+            // 使用 worldToLocalMatrix 转换世界坐标到 Canvas 本地坐标
+            Vector2 localPointA = root.worldToLocalMatrix.MultiplyPoint3x4(lastSentimentWidget.own.transform.position);
+            Vector2 localPointB = root.worldToLocalMatrix.MultiplyPoint3x4(transform.position);
+
+            SentimentXianWidget sentimentXianWidget = await UIManager.Instance.CreateGComponent<SentimentXianWidget>(null, root);
+            sentimentXianWidget.transform.anchoredPosition = root.worldToLocalMatrix * transform.position;
+
+
+            // // 计算 Image 的长度（两点之间的距离）
+            float distance = Vector2.Distance(localPointA, localPointB);
+            sentimentXianWidget.transform.sizeDelta = new Vector2(sentimentXianWidget.transform.sizeDelta.x,distance);
+            //
+            // // 计算 Image 的旋转角度
+            Vector2 direction = transform.position - lastSentimentWidget.own.transform.position;
+            float angle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
+            sentimentXianWidget.transform.rotation = Quaternion.Euler(0, 0, angle);
+        }
     }
 }

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

@@ -20,6 +20,8 @@ namespace Fort23.Mono
 
         private List<SentimentEffectConfig> currentGroupSentimentEffectConfigs;
 
+        public SentimentEffectWidget mainSentimentEffectWidget;
+
         private SentimentEffectWidget currentSentimentEffectWidget;
 
         private void Init()
@@ -73,19 +75,20 @@ namespace Fort23.Mono
         {
             sentimentData = uiData[0] as AccountFileInfo.SentimentData;
             _sentimentEffectConfigs = ConfigComponent.Instance.GetAll<SentimentEffectConfig>().ToList();
-            SentimentEffectWidget sentimentEffectWidget = await UIManager.Instance.CreateGComponentForObject<SentimentEffectWidget>(MainSentimentEffectWidget, null);
-            sentimentEffectWidget.CustomInit(sentimentData.mainSentiment);
-            sentimentEffectWidget.OnClick = OnClick;
+            mainSentimentEffectWidget = await UIManager.Instance.CreateGComponentForObject<SentimentEffectWidget>(MainSentimentEffectWidget, null);
+            mainSentimentEffectWidget.CustomInit(sentimentData.mainSentiment);
+            mainSentimentEffectWidget.OnClick = OnClick;
             foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
             {
                 int level = sentimentDataSentimentProperty.level <= 0 ? 1 : sentimentDataSentimentProperty.level;
-                int conFigId = sentimentDataSentimentProperty.groupId * 100 + level;
+                int conFigId = sentimentDataSentimentProperty.groupId * 10 + level;
                 var sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
-                int index =  sentimentEffectConfig.pos % 3;
-                
+                int index = sentimentEffectConfig.pos / 3;
+
                 SentimentEffectWidget sentimentEffectWidget1 = await UIManager.Instance.CreateGComponent<SentimentEffectWidget>(null, Root[index]);
                 sentimentEffectWidget1.CustomInit(sentimentDataSentimentProperty);
                 sentimentEffectWidget1.OnClick = OnClick;
+
                 sentimentEffectWidgets.Add(sentimentEffectWidget1);
                 if (currentSentimentEffectWidget == null)
                 {
@@ -93,9 +96,33 @@ namespace Fort23.Mono
                 }
             }
 
+           
+
             return await base.AsyncInit(uiData);
         }
 
+        public async override CTask Show()
+        {
+             await base.Show();
+             foreach (var sentimentEffectWidget in sentimentEffectWidgets)
+             {
+                 int level = sentimentEffectWidget.sentimentProperty.level <= 0 ? 1 : sentimentEffectWidget.sentimentProperty.level;
+                 int conFigId = sentimentEffectWidget.sentimentProperty.groupId * 10 + level;
+                 var sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
+                 SentimentEffectWidget sentimentEffectWidget1 = null;
+                 if (sentimentEffectConfig.lastSentimentEffectId == -1)
+                 {
+                     sentimentEffectWidget1 = mainSentimentEffectWidget;
+                 }
+                 else
+                 {
+                     sentimentEffectWidget1 = sentimentEffectWidgets.FirstOrDefault(s => s.sentimentEffectConfig.groupId == sentimentEffectConfig.lastSentimentEffectId);
+                 }
+
+                 sentimentEffectWidget.CreatXian(XianRoot, sentimentEffectWidget1);
+             }
+        }
+
         private void UpdateUi()
         {
             int level = curretnSentimentProperty.level <= 0 ? 1 : curretnSentimentProperty.level;

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

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

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

@@ -0,0 +1,24 @@
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "SentimentXianWidget"  )]
+	public partial class SentimentXianWidget : UIComponent
+	{
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentXianWidget.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: XHxO53mvV3w4q/49rys82u1mM9qUAs3UgkJiQ0ep/k1O0+0C3sKuL1Ni4HaQ
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: