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

# Conflicts:
#	Excel2Json/Excel/Sentiment.xlsx   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/EventConfig.json

@@ -883,12 +883,12 @@
       "Score": 0,
       "EventQuality": 1,
       "PrizeIDs": [
-        1001
+        1003
       ],
       "PrizeNums": [
-        10
+        -100
       ],
-      "RefreshProbability": null,
+      "RefreshProbability": 950,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -912,12 +912,12 @@
       "Score": 0,
       "EventQuality": 1,
       "PrizeIDs": [
-        1001
+        1005
       ],
       "PrizeNums": [
-        10
+        -100
       ],
-      "RefreshProbability": null,
+      "RefreshProbability": 950,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -942,12 +942,12 @@
       "Score": 0,
       "EventQuality": 1,
       "PrizeIDs": [
-        1001
+        1006
       ],
       "PrizeNums": [
-        10
+        -100
       ],
-      "RefreshProbability": null,
+      "RefreshProbability": 950,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -974,9 +974,9 @@
         1001
       ],
       "PrizeNums": [
-        10
+        -100
       ],
-      "RefreshProbability": null,
+      "RefreshProbability": 950,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -1001,12 +1001,12 @@
       "Score": 0,
       "EventQuality": 1,
       "PrizeIDs": [
-        1001
+        1701
       ],
       "PrizeNums": [
-        10
+        1
       ],
-      "RefreshProbability": null,
+      "RefreshProbability": 100,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,
@@ -1030,12 +1030,12 @@
       "Score": 0,
       "EventQuality": 1,
       "PrizeIDs": [
-        1001
+        1002
       ],
       "PrizeNums": [
         10
       ],
-      "RefreshProbability": null,
+      "RefreshProbability": 100,
       "RefreshCount": null,
       "placeID": null,
       "XiantuID": null,

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,

Assets/Res/Config/ItemConfig.json

@@ -745,6 +745,90 @@
       "sort": null,
       "itemDesc2": null
     },
+    {
+      "ID": 1701,
+      "itemName": 3237,
+      "itemDesc": 3240,
+      "icon": "icon_item_1701",
+      "itemTag": 8,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 8,
+      "associateVlaue": [
+        100
+      ],
+      "sort": null,
+      "itemDesc2": null
+    },
+    {
+      "ID": 1702,
+      "itemName": 3238,
+      "itemDesc": 3241,
+      "icon": "icon_item_1702",
+      "itemTag": 8,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 8,
+      "associateVlaue": [
+        300
+      ],
+      "sort": null,
+      "itemDesc2": null
+    },
+    {
+      "ID": 1703,
+      "itemName": 3239,
+      "itemDesc": 3242,
+      "icon": "icon_item_1703",
+      "itemTag": 8,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 8,
+      "associateVlaue": [
+        1000
+      ],
+      "sort": null,
+      "itemDesc2": null
+    },
     {
       "ID": 10001,
       "itemName": 284,
@@ -3669,6 +3753,181 @@
       ],
       "sort": null,
       "itemDesc2": null
+    },
+    {
+      "ID": 22001,
+      "itemName": 3243,
+      "itemDesc": 3250,
+      "icon": "icon_item_22001",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc2": null
+    },
+    {
+      "ID": 22002,
+      "itemName": 3244,
+      "itemDesc": 3251,
+      "icon": "icon_item_22002",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc2": null
+    },
+    {
+      "ID": 22003,
+      "itemName": 3245,
+      "itemDesc": 3252,
+      "icon": "icon_item_22003",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc2": null
+    },
+    {
+      "ID": 22004,
+      "itemName": 3246,
+      "itemDesc": 3253,
+      "icon": "icon_item_22004",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc2": null
+    },
+    {
+      "ID": 22005,
+      "itemName": 3247,
+      "itemDesc": 3254,
+      "icon": "icon_item_22005",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc2": null
+    },
+    {
+      "ID": 22006,
+      "itemName": 3248,
+      "itemDesc": 3255,
+      "icon": "icon_item_22006",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc2": null
+    },
+    {
+      "ID": 22007,
+      "itemName": 3249,
+      "itemDesc": 3256,
+      "icon": "icon_item_22007",
+      "itemTag": 23,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc2": null
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -2006,27 +2006,27 @@
     },
     {
       "ID": 502,
-      "txt": "破天斧"
+      "txt": "噬空齿刃"
     },
     {
       "ID": 503,
-      "txt": "破天斧"
+      "txt": "噬空齿刃"
     },
     {
       "ID": 504,
-      "txt": "破天斧"
+      "txt": "噬空齿刃"
     },
     {
       "ID": 505,
-      "txt": "破天斧"
+      "txt": "噬空齿刃"
     },
     {
       "ID": 506,
-      "txt": "破天斧"
+      "txt": "噬空齿刃"
     },
     {
       "ID": 507,
-      "txt": "破天斧"
+      "txt": "噬空齿刃"
     },
     {
       "ID": 508,
@@ -2078,27 +2078,27 @@
     },
     {
       "ID": 520,
-      "txt": "琉璃宝塔"
+      "txt": "绝脉瓶"
     },
     {
       "ID": 521,
-      "txt": "琉璃宝塔"
+      "txt": "绝脉瓶"
     },
     {
       "ID": 522,
-      "txt": "琉璃宝塔"
+      "txt": "绝脉瓶"
     },
     {
       "ID": 523,
-      "txt": "琉璃宝塔"
+      "txt": "绝脉瓶"
     },
     {
       "ID": 524,
-      "txt": "琉璃宝塔"
+      "txt": "绝脉瓶"
     },
     {
       "ID": 525,
-      "txt": "琉璃宝塔"
+      "txt": "绝脉瓶"
     },
     {
       "ID": 526,
@@ -3674,51 +3674,51 @@
     },
     {
       "ID": 919,
-      "txt": "对敌人照成伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{0}秒"
+      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 920,
-      "txt": "对敌人照成伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{0}秒"
+      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 921,
-      "txt": "对敌人照成伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{0}秒"
+      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 922,
-      "txt": "对敌人照成伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{0}秒"
+      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 923,
-      "txt": "对敌人照成伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{0}秒"
+      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 924,
-      "txt": "对敌人照成伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{0}秒\n神农鼎生效期间，使敌人的所有灵根降低{1}%。"
+      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒\n神农鼎生效期间，使敌人的所有灵根降低{2}%。"
     },
     {
       "ID": 925,
-      "txt": "无视敌人灵根，对敌人造成大量伤害，同时让五行伤势+1"
+      "txt": "无视敌人灵根，对敌人造成{0]伤害，同时让五行伤势1"
     },
     {
       "ID": 926,
-      "txt": "无视敌人灵根，对敌人造成大量伤害，同时让五行伤势+1"
+      "txt": "无视敌人灵根，对敌人造成{0]伤害，同时让五行伤势1"
     },
     {
       "ID": 927,
-      "txt": "无视敌人灵根，对敌人造成大量伤害，同时让五行伤势+1"
+      "txt": "无视敌人灵根，对敌人造成{0]伤害，同时让五行伤势1"
     },
     {
       "ID": 928,
-      "txt": "无视敌人灵根，对敌人造成大量伤害，同时让五行伤势+1"
+      "txt": "无视敌人灵根，对敌人造成{0]伤害，同时让五行伤势1"
     },
     {
       "ID": 929,
-      "txt": "无视敌人灵根，对敌人造成大量伤害，同时让五行伤势+1"
+      "txt": "无视敌人灵根，对敌人造成{0]伤害，同时让五行伤势1"
     },
     {
       "ID": 930,
-      "txt": "无视敌人灵根，对敌人造成大量伤害，同时让五行伤势+1"
+      "txt": "无视敌人灵根，对敌人造成{0]伤害，同时让五行伤势1"
     },
     {
       "ID": 931,
@@ -3770,27 +3770,27 @@
     },
     {
       "ID": 943,
-      "txt": "对敌人照成水系伤害，封锁敌人筋脉随机{0}个格子流动{1}秒"
+      "txt": "对敌人照成{0}水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
     },
     {
       "ID": 944,
-      "txt": "对敌人照成水系伤害，封锁敌人筋脉随机{0}个格子流动{1}秒"
+      "txt": "对敌人照成{0}水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
     },
     {
       "ID": 945,
-      "txt": "对敌人照成水系伤害，封锁敌人筋脉随机{0}个格子流动{1}秒"
+      "txt": "对敌人照成{0}水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
     },
     {
       "ID": 946,
-      "txt": "对敌人照成水系伤害，封锁敌人筋脉随机{0}个格子流动{1}秒"
+      "txt": "对敌人照成{0}水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
     },
     {
       "ID": 947,
-      "txt": "对敌人照成水系伤害，封锁敌人筋脉随机{0}个格子流动{1}秒"
+      "txt": "对敌人照成{0}水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
     },
     {
       "ID": 948,
-      "txt": "对敌人照成水系伤害，封锁敌人筋脉随机{0}个格子流动{1}秒"
+      "txt": "对敌人照成{0}水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
     },
     {
       "ID": 949,
@@ -7602,11 +7602,11 @@
     },
     {
       "ID": 1901,
-      "txt": "事件10005：一只[怪物2]袭击了你，准备迎战"
+      "txt": ""
     },
     {
       "ID": 1902,
-      "txt": "事件10006：一只[怪物3]袭击了你，准备迎战"
+      "txt": ""
     },
     {
       "ID": 1903,
@@ -12875,6 +12875,154 @@
     {
       "ID": 3219,
       "txt": "使用后大幅提升橙色神识事件出现的概率。"
+    },
+    {
+      "ID": 3220,
+      "txt": "你偶然发现一只枯萎的葫芦，但泛着蓝光"
+    },
+    {
+      "ID": 3221,
+      "txt": "好奇的你凑近一看，不知谁将这件法宝遗落于此"
+    },
+    {
+      "ID": 3222,
+      "txt": "但法宝已经枯竭，你后悔没有早点发现它"
+    },
+    {
+      "ID": 3223,
+      "txt": "最后你从法宝中回收了一些玄晶"
+    },
+    {
+      "ID": 3224,
+      "txt": "0"
+    },
+    {
+      "ID": 3225,
+      "txt": "你路过一座矿山，一个闪光点引起了你的注意"
+    },
+    {
+      "ID": 3226,
+      "txt": "原来这是一颗珍贵的绿玛瑙"
+    },
+    {
+      "ID": 3227,
+      "txt": "你祭出法宝，将它转化成一些灵石"
+    },
+    {
+      "ID": 3228,
+      "txt": "0"
+    },
+    {
+      "ID": 3229,
+      "txt": "漫漫旅途，你通过神识释放增进不少阅历"
+    },
+    {
+      "ID": 3230,
+      "txt": "但随之而来的是神识用尽的空虚感"
+    },
+    {
+      "ID": 3231,
+      "txt": "但这种感受何尝又不是一种新的阅历呢"
+    },
+    {
+      "ID": 3232,
+      "txt": "你将这些新的感悟存进了一颗神识丹"
+    },
+    {
+      "ID": 3233,
+      "txt": "0"
+    },
+    {
+      "ID": 3234,
+      "txt": "两只体型硕大的妖兽正在为了一颗灵丹而缠斗"
+    },
+    {
+      "ID": 3235,
+      "txt": "突然一道闪电自天而降，正中两只妖兽"
+    },
+    {
+      "ID": 3236,
+      "txt": "何其悲哉，念完往生咒，你顺手拿走了这颗珍贵的妖丹"
+    },
+    {
+      "ID": 3237,
+      "txt": "神识丹-小"
+    },
+    {
+      "ID": 3238,
+      "txt": "神识丹-中"
+    },
+    {
+      "ID": 3239,
+      "txt": "神识丹-大"
+    },
+    {
+      "ID": 3240,
+      "txt": "道具描述_神识丹-小"
+    },
+    {
+      "ID": 3241,
+      "txt": "道具描述_神识丹-中"
+    },
+    {
+      "ID": 3242,
+      "txt": "道具描述_神识丹-大"
+    },
+    {
+      "ID": 3243,
+      "txt": "感悟点1"
+    },
+    {
+      "ID": 3244,
+      "txt": "感悟点2"
+    },
+    {
+      "ID": 3245,
+      "txt": "感悟点3"
+    },
+    {
+      "ID": 3246,
+      "txt": "感悟点4"
+    },
+    {
+      "ID": 3247,
+      "txt": "感悟点5"
+    },
+    {
+      "ID": 3248,
+      "txt": "感悟点6"
+    },
+    {
+      "ID": 3249,
+      "txt": "感悟点7"
+    },
+    {
+      "ID": 3250,
+      "txt": "道具描述_感悟点1"
+    },
+    {
+      "ID": 3251,
+      "txt": "道具描述_感悟点2"
+    },
+    {
+      "ID": 3252,
+      "txt": "道具描述_感悟点3"
+    },
+    {
+      "ID": 3253,
+      "txt": "道具描述_感悟点4"
+    },
+    {
+      "ID": 3254,
+      "txt": "道具描述_感悟点5"
+    },
+    {
+      "ID": 3255,
+      "txt": "道具描述_感悟点6"
+    },
+    {
+      "ID": 3256,
+      "txt": "道具描述_感悟点7"
     }
   ]
 }

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/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/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -58,9 +58,10 @@ 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);
+                   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