Bläddra i källkod

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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version
李桃 1 månad sedan
förälder
incheckning
ea6aaeae12
47 ändrade filer med 4721 tillägg och 1604 borttagningar
  1. 334 2
      Assets/Art/HeroTimeLine/fb_wulonglunTimeline.playable
  2. 1 1
      Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat
  3. 449 510
      Assets/Res/Config/EventConfig.json
  4. 160 79
      Assets/Res/Config/EventLinkConfig.json
  5. 34 0
      Assets/Res/Config/FabaoConfig.json
  6. 9 1
      Assets/Res/Config/GameConstantConfig.json
  7. 259 0
      Assets/Res/Config/ItemConfig.json
  8. 180 32
      Assets/Res/Config/LanguageChineseConfig.json
  9. 1190 455
      Assets/Res/Config/SentimentEffectConfig.json
  10. 138 0
      Assets/Res/Config/SkillConfig.json
  11. 0 0
      Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt
  12. 918 175
      Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab
  13. 106 0
      Assets/Res/UI/SentimentPanel/SentimentXianWidget.prefab
  14. 7 0
      Assets/Res/UI/SentimentPanel/SentimentXianWidget.prefab.meta
  15. 3 3
      Assets/Scenes/testCombat.scene
  16. 12 0
      Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs
  17. 18 0
      Assets/Scripts/GameData/ExcelConfig/SentimentEffectConfig.cs
  18. 17 18
      Assets/Scripts/GameLogic/Bag/BagController.cs
  19. 2 1
      Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs
  20. 68 0
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3102.cs
  21. 3 0
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3102.cs.meta
  22. 1 1
      Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs
  23. 6 0
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  24. 49 6
      Assets/Scripts/GameUI/EventManager/EventSystemManager.cs
  25. 5 3
      Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs
  26. 4 4
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs
  27. 24 6
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs
  28. 1 1
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanel.cs
  29. 1 1
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs
  30. 64 2
      Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs
  31. 134 8
      Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs
  32. 44 0
      Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanelData.cs
  33. 24 0
      Assets/Scripts/GameUI/UI/SentimentPanel/SentimentXianWidget.cs
  34. 11 0
      Assets/Scripts/GameUI/UI/SentimentPanel/SentimentXianWidget.cs.meta
  35. 1 1
      Assets/Scripts/GameUI/UI/ShopPanel/EnergyWidget.cs
  36. 0 0
      Assets/StreamingAssets/assetConfig.txt
  37. BIN
      Excel2Json/Excel/ChouKa.xlsx
  38. BIN
      Excel2Json/Excel/EventConfig.xlsx
  39. BIN
      Excel2Json/Excel/FabaoConfig.xlsx
  40. BIN
      Excel2Json/Excel/GameConstant.xlsx
  41. BIN
      Excel2Json/Excel/HeroPowerUp.xlsx
  42. BIN
      Excel2Json/Excel/Item.xlsx
  43. BIN
      Excel2Json/Excel/Language.xlsx
  44. BIN
      Excel2Json/Excel/Sentiment.xlsx
  45. BIN
      Excel2Json/Excel/skill.xlsx
  46. BIN
      Excel2Json/Excel/修仙游戏数据规划表.xlsx
  47. 444 294
      UserSettings/Layouts/default-2022.dwlt

+ 334 - 2
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

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.010939717
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 449 - 510
Assets/Res/Config/EventConfig.json


+ 160 - 79
Assets/Res/Config/EventLinkConfig.json

@@ -56,7 +56,7 @@
         177
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 1,
       "optionPara1": [
         1002,
@@ -79,7 +79,7 @@
         178
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -101,7 +101,7 @@
         179
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 1,
       "optionPara1": [
         1005
@@ -122,7 +122,7 @@
         180
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -143,7 +143,7 @@
         181
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -164,7 +164,7 @@
         182
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 1,
       "optionPara1": [
         1011,
@@ -187,7 +187,7 @@
         183
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 1,
       "optionPara1": [
         1014,
@@ -211,7 +211,7 @@
         187
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -232,7 +232,7 @@
         185
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -255,7 +255,7 @@
         189
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -276,7 +276,7 @@
         188
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": null,
       "PrizeIDs": [
         1001
@@ -434,7 +434,7 @@
     },
     {
       "ID": 1030,
-      "conciseEventMessage": 221,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -443,7 +443,7 @@
         221
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 4,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -455,7 +455,7 @@
     },
     {
       "ID": 1040,
-      "conciseEventMessage": 222,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -464,7 +464,7 @@
         222
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 5,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -476,7 +476,7 @@
     },
     {
       "ID": 1050,
-      "conciseEventMessage": 223,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -485,7 +485,7 @@
         223
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 6,
       "optionType": 3,
       "PrizeIDs": [
         1002,
@@ -499,7 +499,7 @@
     },
     {
       "ID": 1060,
-      "conciseEventMessage": 224,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -508,7 +508,7 @@
         224
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 7,
       "optionType": null,
       "ResultType": null
     },
@@ -524,14 +524,10 @@
       ],
       "DialogueType": null,
       "EventID": 11,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
-      "ResultType": 2,
+      "optionType": null,
+      "ResultType": 1,
       "ResultOptions": [
-        1102,
-        100
+        1102
       ]
     },
     {
@@ -546,13 +542,25 @@
       ],
       "DialogueType": null,
       "EventID": 11,
-      "optionType": 3,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        3000
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1103
+      ]
+    },
+    {
+      "ID": 1103,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        209
       ],
+      "DialogueType": null,
+      "EventID": 11,
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -603,13 +611,7 @@
       ],
       "DialogueType": null,
       "EventID": 12,
-      "optionType": 3,
-      "PrizeIDs": [
-        1005
-      ],
-      "PrizeNums": [
-        500
-      ],
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -620,7 +622,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        212
+        3220
       ],
       "DialogueType": null,
       "EventID": 13,
@@ -638,7 +640,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        213
+        3221
       ],
       "DialogueType": null,
       "EventID": 13,
@@ -656,7 +658,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        214
+        3222
       ],
       "DialogueType": null,
       "EventID": 13,
@@ -674,17 +676,11 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        215
+        3223
       ],
       "DialogueType": null,
       "EventID": 13,
-      "optionType": 3,
-      "PrizeIDs": [
-        1006
-      ],
-      "PrizeNums": [
-        500
-      ],
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -695,18 +691,14 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        1901
+        3225
       ],
       "DialogueType": null,
       "EventID": 14,
-      "optionType": 2,
-      "optionPara1": [
-        100002
-      ],
-      "ResultType": 2,
+      "optionType": null,
+      "ResultType": 1,
       "ResultOptions": [
-        1402,
-        100
+        1402
       ]
     },
     {
@@ -717,17 +709,29 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        209
+        3226
       ],
       "DialogueType": null,
       "EventID": 14,
-      "optionType": 3,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        3000
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1403
+      ]
+    },
+    {
+      "ID": 1403,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3227
       ],
+      "DialogueType": null,
+      "EventID": 14,
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -738,18 +742,14 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        1902
+        3229
       ],
       "DialogueType": null,
       "EventID": 15,
-      "optionType": 2,
-      "optionPara1": [
-        100003
-      ],
-      "ResultType": 2,
+      "optionType": null,
+      "ResultType": 1,
       "ResultOptions": [
-        1502,
-        100
+        1502
       ]
     },
     {
@@ -760,17 +760,98 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        209
+        3230
       ],
       "DialogueType": null,
       "EventID": 15,
-      "optionType": 3,
-      "PrizeIDs": [
-        1003
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1503
+      ]
+    },
+    {
+      "ID": 1503,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3231
       ],
-      "PrizeNums": [
-        3000
+      "DialogueType": null,
+      "EventID": 15,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1504
+      ]
+    },
+    {
+      "ID": 1504,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3232
       ],
+      "DialogueType": null,
+      "EventID": 15,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 1601,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3234
+      ],
+      "DialogueType": null,
+      "EventID": 16,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1602
+      ]
+    },
+    {
+      "ID": 1602,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3235
+      ],
+      "DialogueType": null,
+      "EventID": 16,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1603
+      ]
+    },
+    {
+      "ID": 1603,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3236
+      ],
+      "DialogueType": null,
+      "EventID": 16,
+      "optionType": null,
       "ResultType": null
     },
     {

+ 34 - 0
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
     },
     {

+ 9 - 1
Assets/Res/Config/GameConstantConfig.json

@@ -35,7 +35,15 @@
         120,
         240
       ],
-      "RefreshRelevanceEventProbability": 50
+      "RefreshRelevanceEventProbability": 50,
+      "shenshiRecoverSpeed": [
+        12.0,
+        1.0
+      ],
+      "GuajiCD": [
+        6,
+        12
+      ]
     }
   ]
 }

+ 259 - 0
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
     }
   ]
 }

+ 180 - 32
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"
     }
   ]
 }

+ 1190 - 455
Assets/Res/Config/SentimentEffectConfig.json

@@ -1,12 +1,15 @@
 {
   "configList": [
     {
-      "ID": 101,
+      "ID": 11,
       "groupId": 1,
       "level": 1,
       "name": 3085,
       "icon": "icon",
       "massge": 3134,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60101
@@ -15,12 +18,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 102,
+      "ID": 12,
       "groupId": 1,
       "level": 2,
       "name": 3085,
       "icon": "icon",
       "massge": 3134,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60101
@@ -29,12 +35,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 103,
+      "ID": 13,
       "groupId": 1,
       "level": 3,
       "name": 3085,
       "icon": "icon",
       "massge": 3134,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60101
@@ -43,12 +52,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 104,
+      "ID": 14,
       "groupId": 1,
       "level": 4,
       "name": 3085,
       "icon": "icon",
       "massge": 3134,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60101
@@ -57,12 +69,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 105,
+      "ID": 15,
       "groupId": 1,
       "level": 5,
       "name": 3085,
       "icon": "icon",
       "massge": 3134,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60101
@@ -71,12 +86,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 111,
+      "ID": 21,
       "groupId": 2,
       "level": 1,
       "name": 3086,
       "icon": "icon",
       "massge": 3135,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60102
@@ -85,12 +103,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 112,
+      "ID": 22,
       "groupId": 2,
       "level": 2,
       "name": 3086,
       "icon": "icon",
       "massge": 3135,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60102
@@ -99,12 +120,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 113,
+      "ID": 23,
       "groupId": 2,
       "level": 3,
       "name": 3086,
       "icon": "icon",
       "massge": 3135,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60102
@@ -113,12 +137,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 114,
+      "ID": 24,
       "groupId": 2,
       "level": 4,
       "name": 3086,
       "icon": "icon",
       "massge": 3135,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60102
@@ -127,12 +154,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 115,
+      "ID": 25,
       "groupId": 2,
       "level": 5,
       "name": 3086,
       "icon": "icon",
       "massge": 3135,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60102
@@ -141,12 +171,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 121,
+      "ID": 31,
       "groupId": 3,
       "level": 1,
       "name": 3087,
       "icon": "icon",
       "massge": 3136,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60103
@@ -155,12 +188,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 122,
+      "ID": 32,
       "groupId": 3,
       "level": 2,
       "name": 3087,
       "icon": "icon",
       "massge": 3136,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60103
@@ -169,12 +205,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 123,
+      "ID": 33,
       "groupId": 3,
       "level": 3,
       "name": 3087,
       "icon": "icon",
       "massge": 3136,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60103
@@ -183,12 +222,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 124,
+      "ID": 34,
       "groupId": 3,
       "level": 4,
       "name": 3087,
       "icon": "icon",
       "massge": 3136,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60103
@@ -197,12 +239,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 125,
+      "ID": 35,
       "groupId": 3,
       "level": 5,
       "name": 3087,
       "icon": "icon",
       "massge": 3136,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60103
@@ -211,12 +256,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 131,
+      "ID": 41,
       "groupId": 4,
       "level": 1,
       "name": 3088,
       "icon": "icon",
       "massge": 3137,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60104
@@ -225,12 +273,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 132,
+      "ID": 42,
       "groupId": 4,
       "level": 2,
       "name": 3088,
       "icon": "icon",
       "massge": 3137,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60104
@@ -239,12 +290,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 133,
+      "ID": 43,
       "groupId": 4,
       "level": 3,
       "name": 3088,
       "icon": "icon",
       "massge": 3137,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60104
@@ -253,12 +307,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 134,
+      "ID": 44,
       "groupId": 4,
       "level": 4,
       "name": 3088,
       "icon": "icon",
       "massge": 3137,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60104
@@ -267,12 +324,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 135,
+      "ID": 45,
       "groupId": 4,
       "level": 5,
       "name": 3088,
       "icon": "icon",
       "massge": 3137,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60104
@@ -281,12 +341,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 141,
+      "ID": 51,
       "groupId": 5,
       "level": 1,
       "name": 3089,
       "icon": "icon",
       "massge": 3138,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60105
@@ -295,12 +358,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 142,
+      "ID": 52,
       "groupId": 5,
       "level": 2,
       "name": 3089,
       "icon": "icon",
       "massge": 3138,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60105
@@ -309,12 +375,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 143,
+      "ID": 53,
       "groupId": 5,
       "level": 3,
       "name": 3089,
       "icon": "icon",
       "massge": 3138,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60105
@@ -323,12 +392,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 144,
+      "ID": 54,
       "groupId": 5,
       "level": 4,
       "name": 3089,
       "icon": "icon",
       "massge": 3138,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60105
@@ -337,12 +409,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 145,
+      "ID": 55,
       "groupId": 5,
       "level": 5,
       "name": 3089,
       "icon": "icon",
       "massge": 3138,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60105
@@ -351,12 +426,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 151,
+      "ID": 61,
       "groupId": 6,
       "level": 1,
       "name": 3090,
       "icon": "icon",
       "massge": 3139,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60106
@@ -365,12 +443,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 152,
+      "ID": 62,
       "groupId": 6,
       "level": 2,
       "name": 3090,
       "icon": "icon",
       "massge": 3139,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60106
@@ -379,12 +460,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 153,
+      "ID": 63,
       "groupId": 6,
       "level": 3,
       "name": 3090,
       "icon": "icon",
       "massge": 3139,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60106
@@ -393,12 +477,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 154,
+      "ID": 64,
       "groupId": 6,
       "level": 4,
       "name": 3090,
       "icon": "icon",
       "massge": 3139,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60106
@@ -407,12 +494,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 155,
+      "ID": 65,
       "groupId": 6,
       "level": 5,
       "name": 3090,
       "icon": "icon",
       "massge": 3139,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60106
@@ -421,12 +511,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 161,
+      "ID": 71,
       "groupId": 7,
       "level": 1,
       "name": 3091,
       "icon": "icon",
       "massge": 3140,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60107
@@ -435,12 +528,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 162,
+      "ID": 72,
       "groupId": 7,
       "level": 2,
       "name": 3091,
       "icon": "icon",
       "massge": 3140,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60107
@@ -449,12 +545,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 163,
+      "ID": 73,
       "groupId": 7,
       "level": 3,
       "name": 3091,
       "icon": "icon",
       "massge": 3140,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60107
@@ -463,12 +562,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 164,
+      "ID": 74,
       "groupId": 7,
       "level": 4,
       "name": 3091,
       "icon": "icon",
       "massge": 3140,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60107
@@ -477,12 +579,15 @@
       "upConstCount": 1
     },
     {
-      "ID": 165,
+      "ID": 75,
       "groupId": 7,
       "level": 5,
       "name": 3091,
       "icon": "icon",
       "massge": 3140,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 99,
       "effectVale": [
         60107
@@ -491,2988 +596,3618 @@
       "upConstCount": 1
     },
     {
-      "ID": 171,
+      "ID": 1111,
       "groupId": 111,
       "level": 1,
       "name": 3092,
       "icon": "icon",
       "massge": 3141,
+      "pos": 1,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 172,
+      "ID": 1112,
       "groupId": 111,
       "level": 2,
       "name": 3092,
       "icon": "icon",
       "massge": 3141,
+      "pos": 1,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 173,
+      "ID": 1113,
       "groupId": 111,
       "level": 3,
       "name": 3092,
       "icon": "icon",
       "massge": 3141,
+      "pos": 1,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 174,
+      "ID": 1114,
       "groupId": 111,
       "level": 4,
       "name": 3092,
       "icon": "icon",
       "massge": 3141,
+      "pos": 1,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 175,
+      "ID": 1115,
       "groupId": 111,
       "level": 5,
       "name": 3092,
       "icon": "icon",
       "massge": 3141,
+      "pos": 1,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 1,
       "effectType": 1,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 181,
+      "ID": 1121,
       "groupId": 112,
       "level": 1,
       "name": 3093,
       "icon": "icon",
       "massge": 3142,
+      "pos": 2,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 2,
       "effectType": 6,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 182,
+      "ID": 1122,
       "groupId": 112,
       "level": 2,
       "name": 3093,
       "icon": "icon",
       "massge": 3142,
+      "pos": 2,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 2,
       "effectType": 6,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 183,
+      "ID": 1123,
       "groupId": 112,
       "level": 3,
       "name": 3093,
       "icon": "icon",
       "massge": 3142,
+      "pos": 2,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 2,
       "effectType": 6,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 184,
+      "ID": 1124,
       "groupId": 112,
       "level": 4,
       "name": 3093,
       "icon": "icon",
       "massge": 3142,
+      "pos": 2,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 2,
       "effectType": 6,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 185,
+      "ID": 1125,
       "groupId": 112,
       "level": 5,
       "name": 3093,
       "icon": "icon",
       "massge": 3142,
+      "pos": 2,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 2,
       "effectType": 6,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 191,
+      "ID": 1131,
       "groupId": 113,
       "level": 1,
       "name": 3094,
       "icon": "icon",
       "massge": 3143,
+      "pos": 3,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 3,
       "effectType": 7,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 192,
+      "ID": 1132,
       "groupId": 113,
       "level": 2,
       "name": 3094,
       "icon": "icon",
       "massge": 3143,
+      "pos": 3,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 3,
       "effectType": 7,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 193,
+      "ID": 1133,
       "groupId": 113,
       "level": 3,
       "name": 3094,
       "icon": "icon",
       "massge": 3143,
+      "pos": 3,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 3,
       "effectType": 7,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 194,
+      "ID": 1134,
       "groupId": 113,
       "level": 4,
       "name": 3094,
       "icon": "icon",
       "massge": 3143,
+      "pos": 3,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 3,
       "effectType": 7,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 195,
+      "ID": 1135,
       "groupId": 113,
       "level": 5,
       "name": 3094,
       "icon": "icon",
       "massge": 3143,
+      "pos": 3,
+      "lastSentimentEffectId": -1,
+      "unlockLevel": 3,
       "effectType": 7,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 201,
+      "ID": 1141,
       "groupId": 114,
       "level": 1,
       "name": 3095,
       "icon": "icon",
       "massge": 3144,
+      "pos": 4,
+      "lastSentimentEffectId": 111,
+      "unlockLevel": 1,
       "effectType": 5,
       "effectVale": [
         106,
         1
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 202,
+      "ID": 1142,
       "groupId": 114,
       "level": 2,
       "name": 3095,
       "icon": "icon",
       "massge": 3144,
+      "pos": 4,
+      "lastSentimentEffectId": 111,
+      "unlockLevel": 1,
       "effectType": 5,
       "effectVale": [
         106,
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 203,
+      "ID": 1143,
       "groupId": 114,
       "level": 3,
       "name": 3095,
       "icon": "icon",
       "massge": 3144,
+      "pos": 4,
+      "lastSentimentEffectId": 111,
+      "unlockLevel": 1,
       "effectType": 5,
       "effectVale": [
         106,
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 204,
+      "ID": 1144,
       "groupId": 114,
       "level": 4,
       "name": 3095,
       "icon": "icon",
       "massge": 3144,
+      "pos": 4,
+      "lastSentimentEffectId": 111,
+      "unlockLevel": 1,
       "effectType": 5,
       "effectVale": [
         106,
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 205,
+      "ID": 1145,
       "groupId": 114,
       "level": 5,
       "name": 3095,
       "icon": "icon",
       "massge": 3144,
+      "pos": 4,
+      "lastSentimentEffectId": 111,
+      "unlockLevel": 1,
       "effectType": 5,
       "effectVale": [
         106,
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 211,
+      "ID": 1151,
       "groupId": 115,
       "level": 1,
       "name": 3096,
       "icon": "icon",
       "massge": 3145,
+      "pos": 5,
+      "lastSentimentEffectId": 113,
+      "unlockLevel": 2,
       "effectType": 8,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 212,
+      "ID": 1152,
       "groupId": 115,
       "level": 2,
       "name": 3096,
       "icon": "icon",
       "massge": 3145,
+      "pos": 5,
+      "lastSentimentEffectId": 113,
+      "unlockLevel": 2,
       "effectType": 8,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 213,
+      "ID": 1153,
       "groupId": 115,
       "level": 3,
       "name": 3096,
       "icon": "icon",
       "massge": 3145,
+      "pos": 5,
+      "lastSentimentEffectId": 113,
+      "unlockLevel": 2,
       "effectType": 8,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 214,
+      "ID": 1154,
       "groupId": 115,
       "level": 4,
       "name": 3096,
       "icon": "icon",
       "massge": 3145,
+      "pos": 5,
+      "lastSentimentEffectId": 113,
+      "unlockLevel": 2,
       "effectType": 8,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 215,
+      "ID": 1155,
       "groupId": 115,
       "level": 5,
       "name": 3096,
       "icon": "icon",
       "massge": 3145,
+      "pos": 5,
+      "lastSentimentEffectId": 113,
+      "unlockLevel": 2,
       "effectType": 8,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 221,
+      "ID": 1161,
       "groupId": 116,
       "level": 1,
       "name": 3097,
       "icon": "icon",
       "massge": 3146,
+      "pos": 7,
+      "lastSentimentEffectId": 112,
+      "unlockLevel": 3,
       "effectType": 9,
       "effectVale": [
         2,
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 222,
+      "ID": 1162,
       "groupId": 116,
       "level": 2,
       "name": 3097,
       "icon": "icon",
       "massge": 3146,
+      "pos": 7,
+      "lastSentimentEffectId": 112,
+      "unlockLevel": 3,
       "effectType": 9,
       "effectVale": [
         3,
         10
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 223,
+      "ID": 1163,
       "groupId": 116,
       "level": 3,
       "name": 3097,
       "icon": "icon",
       "massge": 3146,
+      "pos": 7,
+      "lastSentimentEffectId": 112,
+      "unlockLevel": 3,
       "effectType": 9,
       "effectVale": [
         4,
         15
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 224,
+      "ID": 1164,
       "groupId": 116,
       "level": 4,
       "name": 3097,
       "icon": "icon",
       "massge": 3146,
+      "pos": 7,
+      "lastSentimentEffectId": 112,
+      "unlockLevel": 3,
       "effectType": 9,
       "effectVale": [
         5,
         20
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 225,
+      "ID": 1165,
       "groupId": 116,
       "level": 5,
       "name": 3097,
       "icon": "icon",
       "massge": 3146,
+      "pos": 7,
+      "lastSentimentEffectId": 112,
+      "unlockLevel": 3,
       "effectType": 9,
       "effectVale": [
         6,
         25
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22001,
       "upConstCount": 1
     },
     {
-      "ID": 231,
+      "ID": 1211,
       "groupId": 121,
       "level": 1,
       "name": 3098,
       "icon": "icon",
       "massge": 3147,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 2,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 232,
+      "ID": 1212,
       "groupId": 121,
       "level": 2,
       "name": 3098,
       "icon": "icon",
       "massge": 3147,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 2,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 233,
+      "ID": 1213,
       "groupId": 121,
       "level": 3,
       "name": 3098,
       "icon": "icon",
       "massge": 3147,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 2,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 234,
+      "ID": 1214,
       "groupId": 121,
       "level": 4,
       "name": 3098,
       "icon": "icon",
       "massge": 3147,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 2,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 235,
+      "ID": 1215,
       "groupId": 121,
       "level": 5,
       "name": 3098,
       "icon": "icon",
       "massge": 3147,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 2,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 241,
+      "ID": 1221,
       "groupId": 122,
       "level": 1,
       "name": 3099,
       "icon": "icon",
       "massge": 3148,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 242,
+      "ID": 1222,
       "groupId": 122,
       "level": 2,
       "name": 3099,
       "icon": "icon",
       "massge": 3148,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 243,
+      "ID": 1223,
       "groupId": 122,
       "level": 3,
       "name": 3099,
       "icon": "icon",
       "massge": 3148,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 244,
+      "ID": 1224,
       "groupId": 122,
       "level": 4,
       "name": 3099,
       "icon": "icon",
       "massge": 3148,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 245,
+      "ID": 1225,
       "groupId": 122,
       "level": 5,
       "name": 3099,
       "icon": "icon",
       "massge": 3148,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 251,
+      "ID": 1231,
       "groupId": 123,
       "level": 1,
       "name": 3100,
       "icon": "icon",
       "massge": 3149,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 252,
+      "ID": 1232,
       "groupId": 123,
       "level": 2,
       "name": 3100,
       "icon": "icon",
       "massge": 3149,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 253,
+      "ID": 1233,
       "groupId": 123,
       "level": 3,
       "name": 3100,
       "icon": "icon",
       "massge": 3149,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 254,
+      "ID": 1234,
       "groupId": 123,
       "level": 4,
       "name": 3100,
       "icon": "icon",
       "massge": 3149,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 255,
+      "ID": 1235,
       "groupId": 123,
       "level": 5,
       "name": 3100,
       "icon": "icon",
       "massge": 3149,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 261,
+      "ID": 1241,
       "groupId": 124,
       "level": 1,
       "name": 3101,
       "icon": "icon",
       "massge": 3150,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         1
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 262,
+      "ID": 1242,
       "groupId": 124,
       "level": 2,
       "name": 3101,
       "icon": "icon",
       "massge": 3150,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 263,
+      "ID": 1243,
       "groupId": 124,
       "level": 3,
       "name": 3101,
       "icon": "icon",
       "massge": 3150,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 264,
+      "ID": 1244,
       "groupId": 124,
       "level": 4,
       "name": 3101,
       "icon": "icon",
       "massge": 3150,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 265,
+      "ID": 1245,
       "groupId": 124,
       "level": 5,
       "name": 3101,
       "icon": "icon",
       "massge": 3150,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 271,
+      "ID": 1251,
       "groupId": 125,
       "level": 1,
       "name": 3102,
       "icon": "icon",
       "massge": 3151,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 9,
       "effectVale": [
         2,
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 272,
+      "ID": 1252,
       "groupId": 125,
       "level": 2,
       "name": 3102,
       "icon": "icon",
       "massge": 3151,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 9,
       "effectVale": [
         3,
         10
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 273,
+      "ID": 1253,
       "groupId": 125,
       "level": 3,
       "name": 3102,
       "icon": "icon",
       "massge": 3151,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 9,
       "effectVale": [
         4,
         15
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 274,
+      "ID": 1254,
       "groupId": 125,
       "level": 4,
       "name": 3102,
       "icon": "icon",
       "massge": 3151,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 9,
       "effectVale": [
         5,
         20
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 275,
+      "ID": 1255,
       "groupId": 125,
       "level": 5,
       "name": 3102,
       "icon": "icon",
       "massge": 3151,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 9,
       "effectVale": [
         6,
         25
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 281,
+      "ID": 1261,
       "groupId": 126,
       "level": 1,
       "name": 3103,
       "icon": "icon",
       "massge": 3152,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 282,
+      "ID": 1262,
       "groupId": 126,
       "level": 2,
       "name": 3103,
       "icon": "icon",
       "massge": 3152,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 283,
+      "ID": 1263,
       "groupId": 126,
       "level": 3,
       "name": 3103,
       "icon": "icon",
       "massge": 3152,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 284,
+      "ID": 1264,
       "groupId": 126,
       "level": 4,
       "name": 3103,
       "icon": "icon",
       "massge": 3152,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 285,
+      "ID": 1265,
       "groupId": 126,
       "level": 5,
       "name": 3103,
       "icon": "icon",
       "massge": 3152,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22002,
       "upConstCount": 1
     },
     {
-      "ID": 291,
+      "ID": 1311,
       "groupId": 131,
       "level": 1,
       "name": 3104,
       "icon": "icon",
       "massge": 3153,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 3,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 292,
+      "ID": 1312,
       "groupId": 131,
       "level": 2,
       "name": 3104,
       "icon": "icon",
       "massge": 3153,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 3,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 293,
+      "ID": 1313,
       "groupId": 131,
       "level": 3,
       "name": 3104,
       "icon": "icon",
       "massge": 3153,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 3,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 294,
+      "ID": 1314,
       "groupId": 131,
       "level": 4,
       "name": 3104,
       "icon": "icon",
       "massge": 3153,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 3,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 295,
+      "ID": 1315,
       "groupId": 131,
       "level": 5,
       "name": 3104,
       "icon": "icon",
       "massge": 3153,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 3,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 301,
+      "ID": 1321,
       "groupId": 132,
       "level": 1,
       "name": 3105,
       "icon": "icon",
       "massge": 3154,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 302,
+      "ID": 1322,
       "groupId": 132,
       "level": 2,
       "name": 3105,
       "icon": "icon",
       "massge": 3154,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 303,
+      "ID": 1323,
       "groupId": 132,
       "level": 3,
       "name": 3105,
       "icon": "icon",
       "massge": 3154,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 304,
+      "ID": 1324,
       "groupId": 132,
       "level": 4,
       "name": 3105,
       "icon": "icon",
       "massge": 3154,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 305,
+      "ID": 1325,
       "groupId": 132,
       "level": 5,
       "name": 3105,
       "icon": "icon",
       "massge": 3154,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 311,
+      "ID": 1331,
       "groupId": 133,
       "level": 1,
       "name": 3106,
       "icon": "icon",
       "massge": 3155,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 312,
+      "ID": 1332,
       "groupId": 133,
       "level": 2,
       "name": 3106,
       "icon": "icon",
       "massge": 3155,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 313,
+      "ID": 1333,
       "groupId": 133,
       "level": 3,
       "name": 3106,
       "icon": "icon",
       "massge": 3155,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 314,
+      "ID": 1334,
       "groupId": 133,
       "level": 4,
       "name": 3106,
       "icon": "icon",
       "massge": 3155,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 315,
+      "ID": 1335,
       "groupId": 133,
       "level": 5,
       "name": 3106,
       "icon": "icon",
       "massge": 3155,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 321,
+      "ID": 1341,
       "groupId": 134,
       "level": 1,
       "name": 3107,
       "icon": "icon",
       "massge": 3156,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         1
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 322,
+      "ID": 1342,
       "groupId": 134,
       "level": 2,
       "name": 3107,
       "icon": "icon",
       "massge": 3156,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 323,
+      "ID": 1343,
       "groupId": 134,
       "level": 3,
       "name": 3107,
       "icon": "icon",
       "massge": 3156,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 324,
+      "ID": 1344,
       "groupId": 134,
       "level": 4,
       "name": 3107,
       "icon": "icon",
       "massge": 3156,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 325,
+      "ID": 1345,
       "groupId": 134,
       "level": 5,
       "name": 3107,
       "icon": "icon",
       "massge": 3156,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 331,
+      "ID": 1351,
       "groupId": 135,
       "level": 1,
       "name": 3108,
       "icon": "icon",
       "massge": 3157,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 332,
+      "ID": 1352,
       "groupId": 135,
       "level": 2,
       "name": 3108,
       "icon": "icon",
       "massge": 3157,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 333,
+      "ID": 1353,
       "groupId": 135,
       "level": 3,
       "name": 3108,
       "icon": "icon",
       "massge": 3157,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 334,
+      "ID": 1354,
       "groupId": 135,
       "level": 4,
       "name": 3108,
       "icon": "icon",
       "massge": 3157,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 335,
+      "ID": 1355,
       "groupId": 135,
       "level": 5,
       "name": 3108,
       "icon": "icon",
       "massge": 3157,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 10,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 341,
+      "ID": 1361,
       "groupId": 136,
       "level": 1,
       "name": 3109,
       "icon": "icon",
       "massge": 3158,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 8,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 342,
+      "ID": 1362,
       "groupId": 136,
       "level": 2,
       "name": 3109,
       "icon": "icon",
       "massge": 3158,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 8,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 343,
+      "ID": 1363,
       "groupId": 136,
       "level": 3,
       "name": 3109,
       "icon": "icon",
       "massge": 3158,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 8,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 344,
+      "ID": 1364,
       "groupId": 136,
       "level": 4,
       "name": 3109,
       "icon": "icon",
       "massge": 3158,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 8,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 345,
+      "ID": 1365,
       "groupId": 136,
       "level": 5,
       "name": 3109,
       "icon": "icon",
       "massge": 3158,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 8,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22003,
       "upConstCount": 1
     },
     {
-      "ID": 351,
+      "ID": 1411,
       "groupId": 141,
       "level": 1,
       "name": 3110,
       "icon": "icon",
       "massge": 3159,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 4,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 352,
+      "ID": 1412,
       "groupId": 141,
       "level": 2,
       "name": 3110,
       "icon": "icon",
       "massge": 3159,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 4,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 353,
+      "ID": 1413,
       "groupId": 141,
       "level": 3,
       "name": 3110,
       "icon": "icon",
       "massge": 3159,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 4,
       "effectVale": [
         8
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 354,
+      "ID": 1414,
       "groupId": 141,
       "level": 4,
       "name": 3110,
       "icon": "icon",
       "massge": 3159,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 4,
       "effectVale": [
         10
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 355,
+      "ID": 1415,
       "groupId": 141,
       "level": 5,
       "name": 3110,
       "icon": "icon",
       "massge": 3159,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 4,
       "effectVale": [
         12
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 361,
+      "ID": 1421,
       "groupId": 142,
       "level": 1,
       "name": 3111,
       "icon": "icon",
       "massge": 3160,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 362,
+      "ID": 1422,
       "groupId": 142,
       "level": 2,
       "name": 3111,
       "icon": "icon",
       "massge": 3160,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 363,
+      "ID": 1423,
       "groupId": 142,
       "level": 3,
       "name": 3111,
       "icon": "icon",
       "massge": 3160,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 364,
+      "ID": 1424,
       "groupId": 142,
       "level": 4,
       "name": 3111,
       "icon": "icon",
       "massge": 3160,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 365,
+      "ID": 1425,
       "groupId": 142,
       "level": 5,
       "name": 3111,
       "icon": "icon",
       "massge": 3160,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 371,
+      "ID": 1431,
       "groupId": 143,
       "level": 1,
       "name": 3112,
       "icon": "icon",
       "massge": 3161,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 372,
+      "ID": 1432,
       "groupId": 143,
       "level": 2,
       "name": 3112,
       "icon": "icon",
       "massge": 3161,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 373,
+      "ID": 1433,
       "groupId": 143,
       "level": 3,
       "name": 3112,
       "icon": "icon",
       "massge": 3161,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 374,
+      "ID": 1434,
       "groupId": 143,
       "level": 4,
       "name": 3112,
       "icon": "icon",
       "massge": 3161,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 375,
+      "ID": 1435,
       "groupId": 143,
       "level": 5,
       "name": 3112,
       "icon": "icon",
       "massge": 3161,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 381,
+      "ID": 1441,
       "groupId": 144,
       "level": 1,
       "name": 3113,
       "icon": "icon",
       "massge": 3162,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         1
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 382,
+      "ID": 1442,
       "groupId": 144,
       "level": 2,
       "name": 3113,
       "icon": "icon",
       "massge": 3162,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 383,
+      "ID": 1443,
       "groupId": 144,
       "level": 3,
       "name": 3113,
       "icon": "icon",
       "massge": 3162,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 384,
+      "ID": 1444,
       "groupId": 144,
       "level": 4,
       "name": 3113,
       "icon": "icon",
       "massge": 3162,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 385,
+      "ID": 1445,
       "groupId": 144,
       "level": 5,
       "name": 3113,
       "icon": "icon",
       "massge": 3162,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 391,
+      "ID": 1451,
       "groupId": 145,
       "level": 1,
       "name": 3114,
       "icon": "icon",
       "massge": 3163,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 392,
+      "ID": 1452,
       "groupId": 145,
       "level": 2,
       "name": 3114,
       "icon": "icon",
       "massge": 3163,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 393,
+      "ID": 1453,
       "groupId": 145,
       "level": 3,
       "name": 3114,
       "icon": "icon",
       "massge": 3163,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 394,
+      "ID": 1454,
       "groupId": 145,
       "level": 4,
       "name": 3114,
       "icon": "icon",
       "massge": 3163,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 395,
+      "ID": 1455,
       "groupId": 145,
       "level": 5,
       "name": 3114,
       "icon": "icon",
       "massge": 3163,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 401,
+      "ID": 1461,
       "groupId": 146,
       "level": 1,
       "name": 3115,
       "icon": "icon",
       "massge": 3164,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 402,
+      "ID": 1462,
       "groupId": 146,
       "level": 2,
       "name": 3115,
       "icon": "icon",
       "massge": 3164,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 403,
+      "ID": 1463,
       "groupId": 146,
       "level": 3,
       "name": 3115,
       "icon": "icon",
       "massge": 3164,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 404,
+      "ID": 1464,
       "groupId": 146,
       "level": 4,
       "name": 3115,
       "icon": "icon",
       "massge": 3164,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 405,
+      "ID": 1465,
       "groupId": 146,
       "level": 5,
       "name": 3115,
       "icon": "icon",
       "massge": 3164,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22004,
       "upConstCount": 1
     },
     {
-      "ID": 411,
+      "ID": 1511,
       "groupId": 151,
       "level": 1,
       "name": 3116,
       "icon": "icon",
       "massge": 3165,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 412,
+      "ID": 1512,
       "groupId": 151,
       "level": 2,
       "name": 3116,
       "icon": "icon",
       "massge": 3165,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 413,
+      "ID": 1513,
       "groupId": 151,
       "level": 3,
       "name": 3116,
       "icon": "icon",
       "massge": 3165,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 414,
+      "ID": 1514,
       "groupId": 151,
       "level": 4,
       "name": 3116,
       "icon": "icon",
       "massge": 3165,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 415,
+      "ID": 1515,
       "groupId": 151,
       "level": 5,
       "name": 3116,
       "icon": "icon",
       "massge": 3165,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 421,
+      "ID": 1521,
       "groupId": 152,
       "level": 1,
       "name": 3117,
       "icon": "icon",
       "massge": 3166,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 422,
+      "ID": 1522,
       "groupId": 152,
       "level": 2,
       "name": 3117,
       "icon": "icon",
       "massge": 3166,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 423,
+      "ID": 1523,
       "groupId": 152,
       "level": 3,
       "name": 3117,
       "icon": "icon",
       "massge": 3166,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 424,
+      "ID": 1524,
       "groupId": 152,
       "level": 4,
       "name": 3117,
       "icon": "icon",
       "massge": 3166,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 425,
+      "ID": 1525,
       "groupId": 152,
       "level": 5,
       "name": 3117,
       "icon": "icon",
       "massge": 3166,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 431,
+      "ID": 1531,
       "groupId": 153,
       "level": 1,
       "name": 3118,
       "icon": "icon",
       "massge": 3167,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 432,
+      "ID": 1532,
       "groupId": 153,
       "level": 2,
       "name": 3118,
       "icon": "icon",
       "massge": 3167,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 433,
+      "ID": 1533,
       "groupId": 153,
       "level": 3,
       "name": 3118,
       "icon": "icon",
       "massge": 3167,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 434,
+      "ID": 1534,
       "groupId": 153,
       "level": 4,
       "name": 3118,
       "icon": "icon",
       "massge": 3167,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 435,
+      "ID": 1535,
       "groupId": 153,
       "level": 5,
       "name": 3118,
       "icon": "icon",
       "massge": 3167,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 441,
+      "ID": 1541,
       "groupId": 154,
       "level": 1,
       "name": 3119,
       "icon": "icon",
       "massge": 3168,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         1
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 442,
+      "ID": 1542,
       "groupId": 154,
       "level": 2,
       "name": 3119,
       "icon": "icon",
       "massge": 3168,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 443,
+      "ID": 1543,
       "groupId": 154,
       "level": 3,
       "name": 3119,
       "icon": "icon",
       "massge": 3168,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 444,
+      "ID": 1544,
       "groupId": 154,
       "level": 4,
       "name": 3119,
       "icon": "icon",
       "massge": 3168,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 445,
+      "ID": 1545,
       "groupId": 154,
       "level": 5,
       "name": 3119,
       "icon": "icon",
       "massge": 3168,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 451,
+      "ID": 1551,
       "groupId": 155,
       "level": 1,
       "name": 3120,
       "icon": "icon",
       "massge": 3169,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 452,
+      "ID": 1552,
       "groupId": 155,
       "level": 2,
       "name": 3120,
       "icon": "icon",
       "massge": 3169,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 453,
+      "ID": 1553,
       "groupId": 155,
       "level": 3,
       "name": 3120,
       "icon": "icon",
       "massge": 3169,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 454,
+      "ID": 1554,
       "groupId": 155,
       "level": 4,
       "name": 3120,
       "icon": "icon",
       "massge": 3169,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 455,
+      "ID": 1555,
       "groupId": 155,
       "level": 5,
       "name": 3120,
       "icon": "icon",
       "massge": 3169,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 461,
+      "ID": 1561,
       "groupId": 156,
       "level": 1,
       "name": 3121,
       "icon": "icon",
       "massge": 3170,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 462,
+      "ID": 1562,
       "groupId": 156,
       "level": 2,
       "name": 3121,
       "icon": "icon",
       "massge": 3170,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 463,
+      "ID": 1563,
       "groupId": 156,
       "level": 3,
       "name": 3121,
       "icon": "icon",
       "massge": 3170,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 464,
+      "ID": 1564,
       "groupId": 156,
       "level": 4,
       "name": 3121,
       "icon": "icon",
       "massge": 3170,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 465,
+      "ID": 1565,
       "groupId": 156,
       "level": 5,
       "name": 3121,
       "icon": "icon",
       "massge": 3170,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22005,
       "upConstCount": 1
     },
     {
-      "ID": 471,
+      "ID": 1611,
       "groupId": 161,
       "level": 1,
       "name": 3122,
       "icon": "icon",
       "massge": 3171,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 472,
+      "ID": 1612,
       "groupId": 161,
       "level": 2,
       "name": 3122,
       "icon": "icon",
       "massge": 3171,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 473,
+      "ID": 1613,
       "groupId": 161,
       "level": 3,
       "name": 3122,
       "icon": "icon",
       "massge": 3171,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 474,
+      "ID": 1614,
       "groupId": 161,
       "level": 4,
       "name": 3122,
       "icon": "icon",
       "massge": 3171,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 475,
+      "ID": 1615,
       "groupId": 161,
       "level": 5,
       "name": 3122,
       "icon": "icon",
       "massge": 3171,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 481,
+      "ID": 1621,
       "groupId": 162,
       "level": 1,
       "name": 3123,
       "icon": "icon",
       "massge": 3172,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 482,
+      "ID": 1622,
       "groupId": 162,
       "level": 2,
       "name": 3123,
       "icon": "icon",
       "massge": 3172,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 483,
+      "ID": 1623,
       "groupId": 162,
       "level": 3,
       "name": 3123,
       "icon": "icon",
       "massge": 3172,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 484,
+      "ID": 1624,
       "groupId": 162,
       "level": 4,
       "name": 3123,
       "icon": "icon",
       "massge": 3172,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 485,
+      "ID": 1625,
       "groupId": 162,
       "level": 5,
       "name": 3123,
       "icon": "icon",
       "massge": 3172,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 491,
+      "ID": 1631,
       "groupId": 163,
       "level": 1,
       "name": 3124,
       "icon": "icon",
       "massge": 3173,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 492,
+      "ID": 1632,
       "groupId": 163,
       "level": 2,
       "name": 3124,
       "icon": "icon",
       "massge": 3173,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 493,
+      "ID": 1633,
       "groupId": 163,
       "level": 3,
       "name": 3124,
       "icon": "icon",
       "massge": 3173,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 494,
+      "ID": 1634,
       "groupId": 163,
       "level": 4,
       "name": 3124,
       "icon": "icon",
       "massge": 3173,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 495,
+      "ID": 1635,
       "groupId": 163,
       "level": 5,
       "name": 3124,
       "icon": "icon",
       "massge": 3173,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 501,
+      "ID": 1641,
       "groupId": 164,
       "level": 1,
       "name": 3125,
       "icon": "icon",
       "massge": 3174,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         1
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 502,
+      "ID": 1642,
       "groupId": 164,
       "level": 2,
       "name": 3125,
       "icon": "icon",
       "massge": 3174,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 503,
+      "ID": 1643,
       "groupId": 164,
       "level": 3,
       "name": 3125,
       "icon": "icon",
       "massge": 3174,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 504,
+      "ID": 1644,
       "groupId": 164,
       "level": 4,
       "name": 3125,
       "icon": "icon",
       "massge": 3174,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 505,
+      "ID": 1645,
       "groupId": 164,
       "level": 5,
       "name": 3125,
       "icon": "icon",
       "massge": 3174,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 511,
+      "ID": 1651,
       "groupId": 165,
       "level": 1,
       "name": 3126,
       "icon": "icon",
       "massge": 3175,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 512,
+      "ID": 1652,
       "groupId": 165,
       "level": 2,
       "name": 3126,
       "icon": "icon",
       "massge": 3175,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 513,
+      "ID": 1653,
       "groupId": 165,
       "level": 3,
       "name": 3126,
       "icon": "icon",
       "massge": 3175,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 514,
+      "ID": 1654,
       "groupId": 165,
       "level": 4,
       "name": 3126,
       "icon": "icon",
       "massge": 3175,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 515,
+      "ID": 1655,
       "groupId": 165,
       "level": 5,
       "name": 3126,
       "icon": "icon",
       "massge": 3175,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 521,
+      "ID": 1661,
       "groupId": 166,
       "level": 1,
       "name": 3127,
       "icon": "icon",
       "massge": 3176,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 522,
+      "ID": 1662,
       "groupId": 166,
       "level": 2,
       "name": 3127,
       "icon": "icon",
       "massge": 3176,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 523,
+      "ID": 1663,
       "groupId": 166,
       "level": 3,
       "name": 3127,
       "icon": "icon",
       "massge": 3176,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 524,
+      "ID": 1664,
       "groupId": 166,
       "level": 4,
       "name": 3127,
       "icon": "icon",
       "massge": 3176,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 525,
+      "ID": 1665,
       "groupId": 166,
       "level": 5,
       "name": 3127,
       "icon": "icon",
       "massge": 3176,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22006,
       "upConstCount": 1
     },
     {
-      "ID": 531,
+      "ID": 1711,
       "groupId": 171,
       "level": 1,
       "name": 3128,
       "icon": "icon",
       "massge": 3177,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 532,
+      "ID": 1712,
       "groupId": 171,
       "level": 2,
       "name": 3128,
       "icon": "icon",
       "massge": 3177,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 533,
+      "ID": 1713,
       "groupId": 171,
       "level": 3,
       "name": 3128,
       "icon": "icon",
       "massge": 3177,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 534,
+      "ID": 1714,
       "groupId": 171,
       "level": 4,
       "name": 3128,
       "icon": "icon",
       "massge": 3177,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 535,
+      "ID": 1715,
       "groupId": 171,
       "level": 5,
       "name": 3128,
       "icon": "icon",
       "massge": 3177,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 1,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 541,
+      "ID": 1721,
       "groupId": 172,
       "level": 1,
       "name": 3129,
       "icon": "icon",
       "massge": 3178,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 542,
+      "ID": 1722,
       "groupId": 172,
       "level": 2,
       "name": 3129,
       "icon": "icon",
       "massge": 3178,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 543,
+      "ID": 1723,
       "groupId": 172,
       "level": 3,
       "name": 3129,
       "icon": "icon",
       "massge": 3178,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 544,
+      "ID": 1724,
       "groupId": 172,
       "level": 4,
       "name": 3129,
       "icon": "icon",
       "massge": 3178,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 545,
+      "ID": 1725,
       "groupId": 172,
       "level": 5,
       "name": 3129,
       "icon": "icon",
       "massge": 3178,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 6,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 551,
+      "ID": 1731,
       "groupId": 173,
       "level": 1,
       "name": 3130,
       "icon": "icon",
       "massge": 3179,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 552,
+      "ID": 1732,
       "groupId": 173,
       "level": 2,
       "name": 3130,
       "icon": "icon",
       "massge": 3179,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 553,
+      "ID": 1733,
       "groupId": 173,
       "level": 3,
       "name": 3130,
       "icon": "icon",
       "massge": 3179,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 554,
+      "ID": 1734,
       "groupId": 173,
       "level": 4,
       "name": 3130,
       "icon": "icon",
       "massge": 3179,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 555,
+      "ID": 1735,
       "groupId": 173,
       "level": 5,
       "name": 3130,
       "icon": "icon",
       "massge": 3179,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 7,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 561,
+      "ID": 1741,
       "groupId": 174,
       "level": 1,
       "name": 3131,
       "icon": "icon",
       "massge": 3180,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         1
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 562,
+      "ID": 1742,
       "groupId": 174,
       "level": 2,
       "name": 3131,
       "icon": "icon",
       "massge": 3180,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 563,
+      "ID": 1743,
       "groupId": 174,
       "level": 3,
       "name": 3131,
       "icon": "icon",
       "massge": 3180,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 564,
+      "ID": 1744,
       "groupId": 174,
       "level": 4,
       "name": 3131,
       "icon": "icon",
       "massge": 3180,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 565,
+      "ID": 1745,
       "groupId": 174,
       "level": 5,
       "name": 3131,
       "icon": "icon",
       "massge": 3180,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 5,
       "effectVale": [
         106,
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 571,
+      "ID": 1751,
       "groupId": 175,
       "level": 1,
       "name": 3132,
       "icon": "icon",
       "massge": 3181,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 572,
+      "ID": 1752,
       "groupId": 175,
       "level": 2,
       "name": 3132,
       "icon": "icon",
       "massge": 3181,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 573,
+      "ID": 1753,
       "groupId": 175,
       "level": 3,
       "name": 3132,
       "icon": "icon",
       "massge": 3181,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 574,
+      "ID": 1754,
       "groupId": 175,
       "level": 4,
       "name": 3132,
       "icon": "icon",
       "massge": 3181,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 575,
+      "ID": 1755,
       "groupId": 175,
       "level": 5,
       "name": 3132,
       "icon": "icon",
       "massge": 3181,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 12,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 581,
+      "ID": 1761,
       "groupId": 176,
       "level": 1,
       "name": 3133,
       "icon": "icon",
       "massge": 3182,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         2
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 582,
+      "ID": 1762,
       "groupId": 176,
       "level": 2,
       "name": 3133,
       "icon": "icon",
       "massge": 3182,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         3
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 583,
+      "ID": 1763,
       "groupId": 176,
       "level": 3,
       "name": 3133,
       "icon": "icon",
       "massge": 3182,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         4
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 584,
+      "ID": 1764,
       "groupId": 176,
       "level": 4,
       "name": 3133,
       "icon": "icon",
       "massge": 3182,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         5
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     },
     {
-      "ID": 585,
+      "ID": 1765,
       "groupId": 176,
       "level": 5,
       "name": 3133,
       "icon": "icon",
       "massge": 3182,
+      "pos": null,
+      "lastSentimentEffectId": null,
+      "unlockLevel": null,
       "effectType": 11,
       "effectVale": [
         6
       ],
-      "upConstItemId": 1,
+      "upConstItemId": 22007,
       "upConstCount": 1
     }
   ]

+ 138 - 0
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,

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 918 - 175
Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab


+ 106 - 0
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: -2.0193, y: 0}
+  m_SizeDelta: {x: 4.0386, 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: 0.9058824, g: 0.86274517, b: 0.6627451, 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

+ 7 - 0
Assets/Res/UI/SentimentPanel/SentimentXianWidget.prefab.meta

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

+ 3 - 3
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: []

+ 12 - 0
Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -98,6 +98,18 @@ public int[] DaoyouguajiDuration;
 public int RefreshRelevanceEventProbability;
 
 
+		/// <summary>
+		///神识恢复速率 每{0}秒恢复{1}点
+		/// </summary>
+public float[] shenshiRecoverSpeed;
+
+
+		/// <summary>
+		///挂机事件结束后下个挂机事件出现的时间间隔(最小和最大秒)
+		/// </summary>
+public int[] GuajiCD;
+
+
 	}
 
 }

+ 18 - 0
Assets/Scripts/GameData/ExcelConfig/SentimentEffectConfig.cs

@@ -50,6 +50,24 @@ public string icon;
 public int massge;
 
 
+		/// <summary>
+		///位置
+		/// </summary>
+public int pos;
+
+
+		/// <summary>
+		///前置条件 (-1是主属性)
+		/// </summary>
+public int lastSentimentEffectId;
+
+
+		/// <summary>
+		///解锁等级
+		/// </summary>
+public int unlockLevel;
+
+
 		/// <summary>
 		///见条件类型表
 		/// </summary>

+ 17 - 18
Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -9,19 +9,18 @@ using Utility;
 
 namespace GameLogic.Bag
 {
-    public class BagController 
+    public class BagController
     {
         /// <summary>
         /// 玩家的所有道具(包含货币)
         /// </summary>
         // private List<ItemInfo> m_bagList = new List<ItemInfo>();
-        
         private Dictionary<string, ItemInfo> m_allBagDic = new Dictionary<string, ItemInfo>();
 
         /// <summary>
         /// 外部访问用
         /// </summary>
-        public Dictionary<string, ItemInfo>  allBagDic => m_allBagDic;
+        public Dictionary<string, ItemInfo> allBagDic => m_allBagDic;
 
 
         public void Init()
@@ -146,9 +145,8 @@ namespace GameLogic.Bag
         {
             for (int i = 0; i < itemInfos.Count; i++)
             {
-                
                 ItemInfo item = itemInfos[i];
-                LogTool.Log("获得了道具"+item.itemID);
+                LogTool.Log("获得了道具" + item.itemID);
                 AddItem(item);
                 // //掉落的数量
                 // long count = itemInfo.count.Value;
@@ -159,7 +157,7 @@ namespace GameLogic.Bag
                 //     PlayerManager.Instance.eqController.AddEquipment(item);
                 // }
                 //
-                
+
                 // AddItemCount(item, count);
             }
         }
@@ -178,11 +176,11 @@ namespace GameLogic.Bag
             }
 
             item.count += count;
-            
-            EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() { ItemInfo = item,Count = (int)count});
-            EventManager.Instance.Dispatch(CustomEventType.AddItem, new ItemUpdateData() { ItemInfo = item,Count = (int)count});
+
+            EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() { ItemInfo = item, Count = (int)count });
+            EventManager.Instance.Dispatch(CustomEventType.AddItem, new ItemUpdateData() { ItemInfo = item, Count = (int)count });
             AccountFileInfo.Instance.SaveItemData(item);
-        
+
             return true;
         }
 
@@ -215,7 +213,7 @@ namespace GameLogic.Bag
             //掉落的数量
             long count = item.count.Value;
             ItemInfo itemInfo = GetItemInfo(item);
-            
+
             // if (itemInfo.IsEquipItem())
             // {
             //     PlayerManager.Instance.eqController.AddEquipment(itemInfo);    
@@ -244,6 +242,7 @@ namespace GameLogic.Bag
             {
                 m_allBagDic.Remove(itemInfo.guid);
             }
+
             AccountFileInfo.Instance.SaveItemData(itemInfo, saveNow);
         }
 
@@ -252,7 +251,7 @@ namespace GameLogic.Bag
             itemInfo.count.Value -= itemInfo.count.Value;
             AccountFileInfo.Instance.SaveItemData(itemInfo, saveNow);
         }
-        
+
         /// <summary>
         /// 获取道具信息
         /// 不传guid,默认itemId就是guid
@@ -284,7 +283,6 @@ namespace GameLogic.Bag
         /// <returns></returns>
         public ItemInfo GetItemInfo(ItemInfo itemInfo)
         {
-            
             string guidStr = string.IsNullOrEmpty(itemInfo.guid) ? itemInfo.itemID.ToString() : itemInfo.guid;
 
             if (m_allBagDic.TryGetValue(guidStr, out ItemInfo item))
@@ -299,11 +297,14 @@ namespace GameLogic.Bag
 
             return itemInfo;
         }
-        
+
         public long GetItemCount(int itemId)
         {
-
             ItemInfo itemInfo = GetItemInfo(itemId);
+            if (itemInfo == null)
+            {
+                return 0;
+            }
 
             return itemInfo.count.Value;
         }
@@ -337,9 +338,7 @@ namespace GameLogic.Bag
 
             return newItem;
         }
-        
-       
-        
+
 
         /// <summary>
         /// 扣除道具,最后都这里

+ 2 - 1
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);
                 }

+ 68 - 0
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);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3102.cs.meta

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

+ 1 - 1
Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs

@@ -94,7 +94,7 @@ namespace GameLogic.Hero
             attriButedIC.Clear();
 
             //计算加得属性
-            for (var i = 0; i < FabaoConfig.ShuxingIDs.Length; i++)
+            for (var i = 0; i < FabaoConfig.ShuxingIDs?.Length; i++)
             {
                 float attribute = GetAttriBute(FabaoConfig.ShuxingIDs[i]);
 

+ 6 - 0
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -580,6 +580,12 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         
         playerData.ItemListData.Add(new ItemData(21012, 10));
         playerData.ItemListData.Add(new ItemData(21013, 10));
+        
+        
+        
+        playerData.ItemListData.Add(new ItemData(21001, 10));
+        playerData.ItemListData.Add(new ItemData(21002, 10));
+        playerData.ItemListData.Add(new ItemData(21003, 10));
 
         // var allSkill = new[] { 1101};
         // foreach (var i in allSkill)

+ 49 - 6
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -109,7 +109,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
     }
 
-    public List<AccountFileInfo.EventList> UseDivinesense(int useCount)
+    public List<AccountFileInfo.EventList> UseDivinesense(int useCount, List<ItemInfo> useItems)
     {
         //使用神识先移除完成的事件
         List<AccountFileInfo.EventList> removeEvents = new List<AccountFileInfo.EventList>();
@@ -150,7 +150,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
 
 
-        var eventConfigs = DetectEvents(useCount);
+        var eventConfigs = DetectEvents(useCount, useItems);
         if (eventConfigs == null || eventConfigs.Count == 0)
             return default;
 
@@ -272,7 +272,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         return false;
     }
 
-    private List<AccountFileInfo.EventList> DetectEvents(int eventCount)
+    private List<AccountFileInfo.EventList> DetectEvents(int eventCount, List<ItemInfo> useItems)
     {
         PlacesConfig bigMap = ConfigComponent.Instance.Get<PlacesConfig>(PlayerManager.Instance.CurrentPlaces.id);
         DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
@@ -375,8 +375,33 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
 
 
+            //概率
+            ItemInfo itemInfoType1 = null;
+            //类型
+            ItemInfo itemInfoType2 = null;
+
+            foreach (var itemInfo in useItems)
+            {
+                if (itemInfo.config.associateID == 6)
+                {
+                    itemInfoType1 = itemInfo;
+                }
+                else if (itemInfo.config.associateID == 7)
+                {
+                    itemInfoType2 = itemInfo;
+                }
+            }
+
+
+            float[] QualityBonusChance = divineSenseConfig.QualityBonusChance.ToArray();
+            if (itemInfoType1 != null)
+            {
+                QualityBonusChance[itemInfoType1.config.associateVlaue[0] - 1] *= itemInfoType1.config.associateVlaue[1];
+            }
+
+
             //先掉落出品质
-            int quality = UtilTools.GetRandomByWeight(qualitys, divineSenseConfig.QualityBonusChance);
+            int quality = UtilTools.GetRandomByWeight(qualitys, QualityBonusChance);
 
 
             // // 获取通用事件
@@ -387,11 +412,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
             // List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
 
             // 获取通用事件
-            List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID)).ToList();
+            List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID) && CanEventType(e.ID, itemInfoType2)).ToList();
 
 
             //场景特定事件
-            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID)).ToList();
+            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID) && CanEventType(e.ID, itemInfoType2)).ToList();
 
             if (candidateEvents.Count == 0 && globalEvents.Count == 0)
             {
@@ -757,6 +782,24 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
     }
 
+    //指定type事件
+    private bool CanEventType(int eventID, ItemInfo itemInfo)
+    {
+        if (itemInfo == null)
+        {
+            return true;
+        }
+
+        var evt = eventConfigs.Find(e => e.ID == eventID);
+        if (evt.PrizeType != null && evt.PrizeType.Contains(itemInfo.config.associateVlaue[0]))
+        {
+            return true;
+        }
+
+
+        return false;
+    }
+
 
     /// <summary>
     /// 检查事件是否满足触发条件。

+ 5 - 3
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 
@@ -54,7 +55,7 @@ namespace Fort23.Mono
                 CombatDrive.Instance.CombatController.isUpdate = true;
             });
 
-            bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel((count) => { Bnt_shengShi_onClick(count); }); });
+            bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel((count,useItems) => { Bnt_shengShi_onClick(count,useItems); }); });
             Btn_GongFa.onClick.AddListener(async () =>
             {
                 if (currentOpenUIPanel is SkillSelectPanel)
@@ -111,7 +112,7 @@ namespace Fort23.Mono
         {
         }
 
-        private async void Bnt_shengShi_onClick(int count)
+        private async void Bnt_shengShi_onClick(int count,List<ItemInfo> useItems)
         {
             // EventSystemManager.Instance.DetectRandomEvents();
 
@@ -119,6 +120,7 @@ namespace Fort23.Mono
                 PlayerManager.Instance.gameConstantConfig.DetectEventCount)
             {
                 TipMessagePanel.OpenTipMessagePanel("神识值不够!");
+                
                 return;
             }
             EventSystemManager.Instance.CancelEvent();
@@ -129,7 +131,7 @@ namespace Fort23.Mono
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
             CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
                 .playerHeroEntity.GameObject.transform);
-            List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(count);
+            List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(count,useItems);
             await TimerComponent.Instance.WaitAsync(800);
             EventSystemManager.Instance.isTriggerEvent = false;
             if (eventLists == null || eventLists.Count == 0)

+ 4 - 4
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -22,9 +22,9 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            // isPopUi = true;
-            isAddStack = true;
-            IsShowAppBar = false;
+            isPopUi = true;
+            // isAddStack = true;
+            // IsShowAppBar = false;
         }
 
         protected override void AddEvent()
@@ -192,7 +192,7 @@ namespace Fort23.Mono
 
         public async static CTask<DivineSenceEventPreviewPanel> OpenPanel()
         {
-            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null);
+            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null,UILayer.Top);
             return divineSenceEventPreviewPanel;
         }
 

+ 24 - 6
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using UnityEngine;
 using Utility;
 
@@ -12,9 +13,12 @@ namespace Fort23.Mono
     [UIBinding(prefab = "DivineSenceInfoPanel")]
     public partial class DivineSenceInfoPanel : UIPanel
     {
-        private Action<int> callback;
+        private Action<int,List<ItemInfo>> callback;
 
         private int useCount = 0;
+        
+        
+        List<ItemInfo> useItems = new List<ItemInfo>();
 
         List<DivineSenceInfoBtnWidget> _divineSenceInfoBtnWidgets = new List<DivineSenceInfoBtnWidget>();
         private int maxCount;
@@ -37,7 +41,15 @@ namespace Fort23.Mono
         {
             Btn_Ok.onClick.AddListener(() =>
             {
-                callback?.Invoke(useCount);
+                useItems.Clear();
+                foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
+                {
+                    if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null )
+                    {
+                        useItems.Add(senceInfoBtnWidget.ItemInfo);
+                    }
+                }
+                callback?.Invoke(useCount,useItems);
                 UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Back.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
@@ -54,9 +66,15 @@ namespace Fort23.Mono
             });
 
             Btn_Tip.onClick.AddListener(() => { DivineSenceLevelPreviewPanel.OpenPanel(); });
+            
+            
+            Btn_Event.onClick.AddListener(() =>
+            {
+                DivineSenceEventPreviewPanel.OpenPanel();
+            });
         }
 
-        public async void CustomInit(Action<int> callback)
+        public async void CustomInit(Action<int,List<ItemInfo>> callback)
         {
             _divineSenceInfoBtnWidgets.Clear();
             divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
@@ -90,7 +108,7 @@ namespace Fort23.Mono
             divineSenceInfoBtnWidget.OnClick = OnClick;
             _divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
             divineSenceInfoBtnWidget = await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(DivineSenceInfoBtnWidgetGam2, null);
-            divineSenceInfoBtnWidget.CustomInit(-1, 3);
+            divineSenceInfoBtnWidget.CustomInit(-1, 2);
             divineSenceInfoBtnWidget.OnClick = OnClick;
             _divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
 
@@ -121,7 +139,7 @@ namespace Fort23.Mono
             Map<int, int> probabilitiesMap = new Map<int, int>();
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
-                if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo.config.associateID == 6)
+                if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null && senceInfoBtnWidget.ItemInfo.config.associateID == 6)
                 {
                     if (!probabilitiesMap.ContainsKey(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]))
                     {
@@ -151,7 +169,7 @@ namespace Fort23.Mono
             }
         }
 
-        public async static CTask OpenPanel(Action<int> callback)
+        public async static CTask OpenPanel(Action<int,List<ItemInfo>> callback)
         {
             DivineSenceInfoPanel divineSenceInfoPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Top);
             divineSenceInfoPanel.CustomInit(callback);

+ 1 - 1
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanel.cs

@@ -38,7 +38,7 @@ namespace Fort23.Mono
             List<ItemInfo> itemInfos = new List<ItemInfo>();
             foreach (var keyValuePair in PlayerManager.Instance.BagController.allBagDic)
             {
-                if (keyValuePair.Value.config.associateID == 6)
+                if (keyValuePair.Value.config.associateID == 6 || keyValuePair.Value.config.associateID == 7)
                 {
                     itemInfos.Add(keyValuePair.Value);
                 }

+ 1 - 1
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -67,7 +67,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel(ItemInfo itemInfo)
         {
-            await UIManager.Instance.LoadAndOpenPanel<ItemDetailsPanel>(null, uiData: new object[] { itemInfo });
+            await UIManager.Instance.LoadAndOpenPanel<ItemDetailsPanel>(null,UILayer.Top, uiData: new object[] { itemInfo });
         }
 
         public override void Close()

+ 64 - 2
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs

@@ -1,6 +1,8 @@
+using System.Collections.Generic;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -9,7 +11,11 @@ namespace Fort23.Mono
     {
         public AccountFileInfo.SentimentProperty sentimentProperty;
 
-        SentimentEffectConfig sentimentEffectConfig;
+        public SentimentEffectConfig sentimentEffectConfig;
+
+        public SentimentEffectWidget lastSentimentWidget;
+
+        List<SentimentXianWidget> _sentimentXianWidgets = new List<SentimentXianWidget>();
 
         private void Init()
         {
@@ -32,7 +38,7 @@ namespace Fort23.Mono
         {
             this.sentimentProperty = sentimentProperty;
             int level = sentimentProperty.level <= 0 ? 1 : sentimentProperty.level;
-            int conFigId = sentimentProperty.groupId * 100 + level;
+            int conFigId = sentimentProperty.groupId * 10 + level;
             sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
             Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);
             if (sentimentProperty.level == 0)
@@ -43,6 +49,62 @@ namespace Fort23.Mono
             {
                 Text_Level.text = "lv." + level;
             }
+      
+        }
+
+        public async void CreatXian(RectTransform root, SentimentEffectWidget lastSentimentWidget)
+        {
+            this.lastSentimentWidget = lastSentimentWidget;
+
+
+            SentimentXianWidget sentimentXianWidget = await UIManager.Instance.CreateGComponent<SentimentXianWidget>(null, root);
+            _sentimentXianWidgets.Add(sentimentXianWidget);
+            var lineRect = sentimentXianWidget.transform;
+            Vector2 localPointA = root.worldToLocalMatrix.MultiplyPoint3x4(lastSentimentWidget.own.transform.position);
+            Vector2 localPointB = root.worldToLocalMatrix.MultiplyPoint3x4(this.transform.position);
+
+
+            lineRect.anchoredPosition = localPointB;
+
+            // 计算长度
+            float distance = Vector2.Distance(localPointA, localPointB);
+            lineRect.sizeDelta = new Vector2(lineRect.sizeDelta.x, distance);
+
+            //计算角度
+            Vector2 direction = localPointB - localPointA;
+            Quaternion q = Quaternion.identity;
+            q.SetFromToRotation(Vector3.up, direction);
+            lineRect.eulerAngles = new Vector3(q.eulerAngles.x, 0, q.eulerAngles.z);
+            UpdateXian();
+        }
+
+        public void UpdateXian()
+        {
+            if (lastSentimentWidget.sentimentProperty.level >= sentimentEffectConfig.unlockLevel)
+            {
+                foreach (var sentimentXianWidget in _sentimentXianWidgets)
+                {
+                    sentimentXianWidget.own.transform.RecoverColor();
+                }
+            }
+            else
+            {
+                foreach (var sentimentXianWidget in _sentimentXianWidgets)
+                {
+                    sentimentXianWidget.own.transform.Gray();
+                }
+            }
+        }
+
+        public override void DormancyObj()
+        {
+            foreach (var sentimentXianWidget in _sentimentXianWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(sentimentXianWidget);
+            }
+            _sentimentXianWidgets.Clear();
+
+            base.DormancyObj();
         }
     }
 }

+ 134 - 8
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -4,6 +4,7 @@ using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using UnityEngine.UI;
 using Utility;
 
 namespace Fort23.Mono
@@ -12,6 +13,7 @@ namespace Fort23.Mono
     public partial class SentimentInfoPanel : UIPanel
     {
         AccountFileInfo.SentimentProperty curretnSentimentProperty;
+        private EnergyWidget energyWidget;
         private AccountFileInfo.SentimentData sentimentData;
 
         List<SentimentEffectWidget> sentimentEffectWidgets = new List<SentimentEffectWidget>();
@@ -20,8 +22,14 @@ namespace Fort23.Mono
 
         private List<SentimentEffectConfig> currentGroupSentimentEffectConfigs;
 
+        public SentimentEffectWidget mainSentimentEffectWidget;
+
         private SentimentEffectWidget currentSentimentEffectWidget;
 
+
+
+        private ItemWidgetType1 _itemWidgetType1;
+
         private void Init()
         {
             isAddStack = false;
@@ -39,6 +47,32 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            Btn_Rest.onClick.AddListener(() =>
+            {
+                foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
+                {
+                    int count = 0;
+                    for (int i = 0; i < sentimentDataSentimentProperty.level; i++)
+                    {
+                        int level1 = sentimentData.sentimentProperties[0].level <= 0 ? 1 : sentimentData.sentimentProperties[0].level;
+                        int conFigId1 = sentimentData.sentimentProperties[0].groupId * 10 + level1;
+                        var sentimentEffectConfig1 = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId1);
+                        count += sentimentEffectConfig1.upConstCount;
+                    }
+
+                    PlayerManager.Instance.BagController.AddItem(energyWidget._itemConfig.ID, count);
+
+
+                    sentimentDataSentimentProperty.level = 0;
+                }
+
+                foreach (var sentimentEffectWidget in sentimentEffectWidgets)
+                {
+                    sentimentEffectWidget.CustomInit(sentimentEffectWidget.sentimentProperty);
+                }
+
+                AccountFileInfo.Instance.SavePlayerData();
+            });
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Btn_LingWu.onClick.AddListener(() =>
             {
@@ -47,6 +81,12 @@ namespace Fort23.Mono
                     return;
                 }
 
+                if (currentSentimentEffectWidget.lastSentimentWidget.sentimentProperty.level < currentSentimentEffectWidget.sentimentEffectConfig.unlockLevel)
+                {
+                    TipMessagePanel.OpenTipMessagePanel("前置节点没有解锁");
+                    return;
+                }
+
                 if (curretnSentimentProperty.level >= currentGroupSentimentEffectConfigs.Count)
                 {
                     TipMessagePanel.OpenTipMessagePanel("已经达到最大等级");
@@ -54,9 +94,10 @@ namespace Fort23.Mono
                 }
 
                 int level = curretnSentimentProperty.level <= 0 ? 1 : curretnSentimentProperty.level;
-                int conFigId = curretnSentimentProperty.groupId * 100 + level;
+                int conFigId = curretnSentimentProperty.groupId * 100 + level + 1;
                 SentimentEffectConfig sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
 
+                PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId, sentimentEffectConfig.upConstCount);
                 //扣除道具
                 // sentimentEffectConfig.upConstItemId.
                 // s
@@ -64,23 +105,65 @@ namespace Fort23.Mono
                 curretnSentimentProperty.level++;
 
                 AccountFileInfo.Instance.SavePlayerData();
+
+
+                foreach (var sentimentEffectWidget in sentimentEffectWidgets)
+                {
+                    sentimentEffectWidget.UpdateXian();
+                }
+
                 UpdateUi();
                 currentSentimentEffectWidget.CustomInit(curretnSentimentProperty);
             });
         }
 
+        public int MapNumber(int input)
+        {
+            if (input >= 1 && input <= 3)
+            {
+                return 0;
+            }
+            else if (input >= 4 && input <= 6)
+            {
+                return 1;
+            }
+            else if (input >= 7 && input <= 9)
+            {
+                return 2;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             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;
+
+
+            int level1 = sentimentData.sentimentProperties[0].level <= 0 ? 1 : sentimentData.sentimentProperties[0].level;
+            int conFigId1 = sentimentData.sentimentProperties[0].groupId * 10 + level1;
+            var sentimentEffectConfig1 = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId1);
+             energyWidget =
+                await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+            energyWidget.CustomInit(sentimentEffectConfig1.upConstItemId);
+
             foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
             {
-                SentimentEffectWidget sentimentEffectWidget1 = await UIManager.Instance.CreateGComponent<SentimentEffectWidget>(null, Content);
+                int level = sentimentDataSentimentProperty.level <= 0 ? 1 : sentimentDataSentimentProperty.level;
+                int conFigId = sentimentDataSentimentProperty.groupId * 10 + level;
+                var sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
+                int index = MapNumber(sentimentEffectConfig.pos);
+
+                SentimentEffectWidget sentimentEffectWidget1 = await UIManager.Instance.CreateGComponent<SentimentEffectWidget>(null, Root[index]);
                 sentimentEffectWidget1.CustomInit(sentimentDataSentimentProperty);
                 sentimentEffectWidget1.OnClick = OnClick;
+
                 sentimentEffectWidgets.Add(sentimentEffectWidget1);
                 if (currentSentimentEffectWidget == null)
                 {
@@ -88,18 +171,59 @@ namespace Fort23.Mono
                 }
             }
 
+            foreach (var rectTransform in Root)
+            {
+                LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
+            }
+
+
             return await base.AsyncInit(uiData);
         }
 
-        private void UpdateUi()
+        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 async void UpdateUi()
         {
             int level = curretnSentimentProperty.level <= 0 ? 1 : curretnSentimentProperty.level;
-            int conFigId = curretnSentimentProperty.groupId * 100 + level;
+            int conFigId = curretnSentimentProperty.groupId * 10 + level;
             SentimentEffectConfig sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
             currentGroupSentimentEffectConfigs = _sentimentEffectConfigs.Where(se => se.groupId == sentimentEffectConfig.groupId).ToList();
             Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);
             Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(sentimentEffectConfig.massge), sentimentEffectConfig.effectVale);
-            Text_Level.text = $"当前层 ;{curretnSentimentProperty.level}/{currentGroupSentimentEffectConfigs.Count}";
+
+            UIManager.Instance.DormancyGComponent(_itemWidgetType1);
+            _itemWidgetType1 = null;
+            _itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam, null);
+            _itemWidgetType1.CustomInit(sentimentEffectConfig.upConstItemId, sentimentEffectConfig.upConstCount);
+
+            if (curretnSentimentProperty.level >= currentGroupSentimentEffectConfigs.Count)
+            {
+                Text_Level.text = $"{curretnSentimentProperty.level}级 ——> MAX级";
+            }
+            else
+            {
+                Text_Level.text = $"{curretnSentimentProperty.level}级 ——> {curretnSentimentProperty.level + 1}级";
+            }
         }
 
         private void OnClick(ItemWidgetBasic obj)
@@ -128,6 +252,8 @@ namespace Fort23.Mono
 
             currentSentimentEffectWidget = null;
             curretnSentimentProperty = null;
+            UIManager.Instance.DormancyGComponent(energyWidget);
+            energyWidget = null;
 
             base.Close();
         }

+ 44 - 0
Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanelData.cs

@@ -96,6 +96,50 @@ namespace Fort23.Mono
 	      return _Content;
 	     }
 	   }
+	  private List<RectTransform> _Root;
+	  public List<RectTransform> Root
+	   {
+	   get{
+	      if (_Root == null)
+	       {
+	         _Root  = GetUIUnit<List<RectTransform>>("Root"); 
+	       }
+	      return _Root;
+	     }
+	   }
+	  private RectTransform _XianRoot;
+	  public RectTransform XianRoot
+	   {
+	   get{
+	      if (_XianRoot == null)
+	       {
+	         _XianRoot  = GetUIUnit<RectTransform>("XianRoot"); 
+	       }
+	      return _XianRoot;
+	     }
+	   }
+	  private Button _Btn_Rest;
+	  public Button Btn_Rest
+	   {
+	   get{
+	      if (_Btn_Rest == null)
+	       {
+	         _Btn_Rest  = GetUIUnit<Button>("Btn_Rest"); 
+	       }
+	      return _Btn_Rest;
+	     }
+	   }
+	  private RectTransform _Group_ResourceBar;
+	  public RectTransform Group_ResourceBar
+	   {
+	   get{
+	      if (_Group_ResourceBar == null)
+	       {
+	         _Group_ResourceBar  = GetUIUnit<RectTransform>("Group_ResourceBar"); 
+	       }
+	      return _Group_ResourceBar;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 24 - 0
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()
+		{
+
+		}
+
+	}
+}

+ 11 - 0
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: 

+ 1 - 1
Assets/Scripts/GameUI/UI/ShopPanel/EnergyWidget.cs

@@ -13,7 +13,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "EnergyWidget")]
     public partial class EnergyWidget : UIComponent
     {
-        private ItemConfig _itemConfig;
+        public ItemConfig _itemConfig;
 
         private void Init()
         {

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/ChouKa.xlsx


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/FabaoConfig.xlsx


BIN
Excel2Json/Excel/GameConstant.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/Sentiment.xlsx


BIN
Excel2Json/Excel/skill.xlsx


BIN
Excel2Json/Excel/修仙游戏数据规划表.xlsx


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 444 - 294
UserSettings/Layouts/default-2022.dwlt


Vissa filer visades inte eftersom för många filer har ändrats