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

# Conflicts:
#	Excel2Json/Excel/EventConfig.xlsx   resolved by master version
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Art/HeroTimeLine/fb_3302.playable

@@ -234,6 +234,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
@@ -245,18 +255,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
---- !u!114 &-8034426028797582310
-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)
-  m_EditorClassIdentifier: 
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-7958483076089108760
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -367,6 +367,55 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
+--- !u!114 &-7513212318413729717
+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: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 0779f8ebdc082844baa1cf3b6ae7812b
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 0}
+  updateParticle: 1
+  particleRandomSeed: 8152
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 0
+  active: 1
+  postPlayback: 2
+  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
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 1
+  loopAlone: 1
+  isActivityCustomTargetPos: 0
+  CustomTargetPosIndex: 0
+  intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-7456703728703065245
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -485,6 +534,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
@@ -496,6 +555,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-7057161302143912424
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -765,6 +826,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
@@ -776,6 +847,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-5612225699036068517
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -796,8 +869,8 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: -83523458902121124}
   - {fileID: 5356558486187184398}
-  - {fileID: 9066145812921407553}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -1287,6 +1360,98 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
   m_Name: ActivationPlayableAsset(Clone)(Clone)(Clone)(Clone)
   m_EditorClassIdentifier: 
+--- !u!114 &-83523458902121124
+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: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track (1)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -5612225699036068517}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7513212318413729717}
+    m_Duration: 3
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -83523458902121124}
+    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: fx_fb_tw_mu hua
+  m_Markers:
+    m_Objects: []
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1449,7 +1614,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -2031,6 +2196,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
@@ -2042,6 +2217,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &4448712841006758773
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2127,7 +2304,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 2825953951352676293}
-    m_Duration: 1.6666666666666667
+    m_Duration: 3
     m_TimeScale: 1
     m_ParentTrack: {fileID: 5356558486187184398}
     m_EaseInDuration: 0
@@ -2278,6 +2455,16 @@ MonoBehaviour:
   targetType: 2
   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
@@ -2289,6 +2476,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &5946645958756819507
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2449,6 +2638,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2460,6 +2659,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &7513549724179277356
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2621,96 +2822,3 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
---- !u!114 &9066145812921407553
-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: -5612225699036068517}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0
-    m_ClipIn: 0
-    m_Asset: {fileID: -8034426028797582310}
-    m_Duration: 1.6666666666666667
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: 9066145812921407553}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: Active
-  m_Markers:
-    m_Objects: []
-  m_PostPlaybackState: 3

Assets/Art/HeroTimeLine/fb_3401.playable

@@ -234,6 +234,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
@@ -245,6 +255,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-8034426028797582310
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -485,6 +497,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
@@ -496,6 +518,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-7057161302143912424
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -741,6 +765,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
@@ -752,6 +786,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-5612225699036068517
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1909,6 +1945,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
@@ -1920,6 +1966,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &1876369852384591244
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2203,6 +2251,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
@@ -2214,6 +2272,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &4448712841006758773
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2432,6 +2492,16 @@ MonoBehaviour:
   targetType: 2
   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
@@ -2443,6 +2513,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &5946645958756819507
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2603,6 +2675,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2614,6 +2696,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &7513549724179277356
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/VFX/FXAnimation/fx_ui_fb_shifang.controller

@@ -11,7 +11,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -1708647650252794724}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 250, y: 60, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Art/VFX/FXMeshs/fx xishou zhaozi.FBX.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: Cy8Y4C2oWn0IrBepeN0HwXQCPDQthIlnVmSuDdFnFsrCHfLyDIAg+Zig0dSY
+ModelImporter:
+  serializedVersion: 22348
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    aCLCompressionLevel: 0
+    aCLCurvePrecision: 0.01
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+    virtualGeometry: 0
+    hasBoneWeight: 0
+    generateGeometryBuffer: 0
+    positionPrecision: -2147483648
+    normalPrecision: -1
+    tangentPrecision: -1
+    surfaceCompensation: 0
+    allMeshUse: 1
+    ignoreSimpleMesh: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_fb_tw_mu hua.prefab

@@ -0,0 +1,457 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &138588810556578607
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5336727271611585528}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fx_fb_tw_mu hua
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5336727271611585528
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 138588810556578607}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 832083974281672429}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4930686043870360468
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 832083974281672429}
+  - component: {fileID: 6962472715069501791}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fx_fb_tw xu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &832083974281672429
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4930686043870360468}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4637620299685329290}
+  - {fileID: 3880146512384379579}
+  m_Father: {fileID: 5336727271611585528}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!96 &6962472715069501791
+TrailRenderer:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4930686043870360468}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 539fde251d413254b8bfabb1646e0b46, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Time: 0.36
+  m_PreviewTimeScale: 1
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.68314886
+        inSlope: 0.020921264
+        outSlope: 0.020921264
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.54939514
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 0.10849041, b: 0.45143357, a: 0.5411765}
+      key1: {r: 0.503994, g: 0, b: 0.7735848, a: 0}
+      key2: {r: 0.015574891, g: 0.017976578, b: 0.16509408, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 36526
+      ctime2: 50501
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 4369
+      atime1: 65535
+      atime2: 65535
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    textureScale: {x: 1, y: 1}
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MinVertexDistance: 0.1
+  m_MaskInteraction: 0
+  m_Autodestruct: 0
+  m_Emitting: 1
+  m_ApplyActiveColorSpace: 1
+--- !u!1 &5064307358172066639
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4637620299685329290}
+  - component: {fileID: 7199523125495675738}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fx_fb_tw (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4637620299685329290
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5064307358172066639}
+  serializedVersion: 2
+  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: 832083974281672429}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!96 &7199523125495675738
+TrailRenderer:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5064307358172066639}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 33504090746f8ac4ab091531f4c518ab, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Time: 0.5
+  m_PreviewTimeScale: 1
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.65476227
+        inSlope: 0.020921264
+        outSlope: 0.020921264
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.54939514
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 0.876, g: 0.23914799, b: 0.5727371, a: 1}
+      key1: {r: 0.42889807, g: 0, b: 0.6084904, a: 1}
+      key2: {r: 0.5499476, g: 0.012834006, b: 0.71300006, a: 0}
+      key3: {r: 0.5283017, g: 0.3217441, b: 0.1445353, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 18986
+      ctime2: 23226
+      ctime3: 43754
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 65535
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    textureScale: {x: 1, y: 1}
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MinVertexDistance: 0.1
+  m_MaskInteraction: 0
+  m_Autodestruct: 0
+  m_Emitting: 1
+  m_ApplyActiveColorSpace: 1
+--- !u!1 &7963750877026383689
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3880146512384379579}
+  - component: {fileID: 4179486518606912110}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fx_fb_tw (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3880146512384379579
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7963750877026383689}
+  serializedVersion: 2
+  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: 832083974281672429}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!96 &4179486518606912110
+TrailRenderer:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7963750877026383689}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 33504090746f8ac4ab091531f4c518ab, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 5
+  m_Time: 0.5
+  m_PreviewTimeScale: 1
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.77976227
+        inSlope: 0.020921264
+        outSlope: 0.020921264
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.54939514
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 0.36242798, g: 0.6132074, b: 0.06652712, a: 1}
+      key1: {r: 0.020558866, g: 0.3962263, b: 0.021726808, a: 1}
+      key2: {r: 0.5499476, g: 0.012834006, b: 0.71300006, a: 0}
+      key3: {r: 0.5283017, g: 0.3217441, b: 0.1445353, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 1735
+      ctime1: 23130
+      ctime2: 23226
+      ctime3: 43754
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 65535
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    textureScale: {x: 1, y: 1}
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MinVertexDistance: 0.1
+  m_MaskInteraction: 0
+  m_Autodestruct: 0
+  m_Emitting: 1
+  m_ApplyActiveColorSpace: 1

Assets/Art/VFX/FXPrefabs/fx_fb_tw_mu hua.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHsWt3irVS2Ojs6e90bdSK4HMs23htLIe/uMlepv6GL1SMQMK+Sk/N+Sy5UR
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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.5
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Assets/Art/VFX/Materials/fx fb 3401 xishou1.mat

@@ -0,0 +1,167 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-4996711989022864374
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fx fb 3401 xishou1
+  m_Shader: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Main_Tex:
+        m_Texture: {fileID: 2800000, guid: 8e649b127878980499ac410535964026, type: 3}
+        m_Scale: {x: 0.8, y: 4}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 2800000, guid: 75b5579840299cb489be1f2347868d3f, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Turb_Noise:
+        m_Texture: {fileID: 2800000, guid: 5d26c351f7b392547a3e5d8011d8bd4b, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _dissolve:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 1
+    - _AlphaClip: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _CTime: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _CustomDataDissolve: 0
+    - _CustomDataMainUV: 0
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DissSoft: 0
+    - _Diss_value: 0
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _MainAlpha: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _Soft_value: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _Turb_Value: 0.24
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    - _ca: 1
+    - _light: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Main_Color: {r: 4, g: 4, b: 4, a: 1}
+    - _Main_UV: {r: -1, g: 0, b: 0, a: 0}
+    - _MaskUVSpeed: {r: 0, g: 0, b: 0, a: 0}
+    - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _Turb_UV: {r: 0, g: -0.3, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/Art/VFX/Materials/fx fb 3401 xishou1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CCtKsHukAnJqaXRSkJ0pDZUgWQMSqh3TMjP+FPDrBLYi8R+kpg3/jtu6qOnu
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/EventLinkConfig.json

@@ -1201,6 +1201,7 @@
       "EventID": 10003,
       "optionType": 1,
       "optionPara1": [
+        1000308,
         1000308
       ],
       "optionPara2": [
@@ -1473,6 +1474,7 @@
       "EventID": 10005,
       "optionType": 1,
       "optionPara1": [
+        1000509,
         1000509
       ],
       "optionPara2": [
@@ -2029,6 +2031,7 @@
       "EventID": 10008,
       "optionType": 1,
       "optionPara1": [
+        1000813,
         1000813
       ],
       "optionPara2": [

Assets/Res/UI/CombatPanel.prefab

@@ -396,6 +396,94 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &509301606961269477
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4852471828528767602}
+  - component: {fileID: 3038109130868707050}
+  - component: {fileID: 1614600260161669484}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bg_hui
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4852471828528767602
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 509301606961269477}
+  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: 4197360294442415998}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 140}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3038109130868707050
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 509301606961269477}
+  m_CullTransparentMesh: 1
+--- !u!114 &1614600260161669484
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 509301606961269477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 2bb159c80d5218f4e8d527118e0f6fac, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 0
+  m_FillClockwise: 1
+  m_FillOrigin: 1
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fbDiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &678450823949686045
 GameObject:
   m_ObjectHideFlags: 0
@@ -428,7 +516,10 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7561374860469839472}
+  - {fileID: 4852471828528767602}
+  - {fileID: 8866218788833705411}
   - {fileID: 271634867267467130}
+  - {fileID: 8095471689865712}
   - {fileID: 6966436685152839904}
   - {fileID: 345731962149340685}
   m_Father: {fileID: 1811249814091911294}
@@ -471,6 +562,21 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: fb_kuang
+    gameObject: {fileID: 2054773142702067391}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: icon_hui
+    gameObject: {fileID: 4497466034855487779}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: bg_hui
+    gameObject: {fileID: 1614600260161669484}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &6539911976127367467
 MonoBehaviour:
@@ -2053,7 +2159,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 80, y: 90}
+  m_SizeDelta: {x: 100, y: 140}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8722334600143122962
 CanvasRenderer:
@@ -2076,7 +2182,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.9529412}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2088,19 +2194,19 @@ MonoBehaviour:
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 1
-  m_FillAmount: 1
+  m_FillAmount: 0
   m_FillClockwise: 0
-  m_FillOrigin: 0
+  m_FillOrigin: 1
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_fb3401
+  _icon_name: dec_fbDiban
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: skillIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
-    lasetJsonGUID: b2843643b4298cdf1d66ce110c944378
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2342,6 +2448,94 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1 &2749743865999300788
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7509376821817412047}
+  - component: {fileID: 3627101906851185713}
+  - component: {fileID: 5744739095708771596}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_kuang
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7509376821817412047
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2749743865999300788}
+  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: 4925541673947957992}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 5}
+  m_SizeDelta: {x: 93, y: 130}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3627101906851185713
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2749743865999300788}
+  m_CullTransparentMesh: 1
+--- !u!114 &5744739095708771596
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2749743865999300788}
+  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.4012, g: 0.68, b: 0.5313067, 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: dec_fb_kuang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2929139248548498174
 GameObject:
   m_ObjectHideFlags: 0
@@ -2609,6 +2803,94 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2992115202248079783
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8816216855009743864}
+  - component: {fileID: 7580416212099536673}
+  - component: {fileID: 7085004999276676131}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bg_hui
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8816216855009743864
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2992115202248079783}
+  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: 4925541673947957992}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 140}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7580416212099536673
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2992115202248079783}
+  m_CullTransparentMesh: 1
+--- !u!114 &7085004999276676131
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2992115202248079783}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 2bb159c80d5218f4e8d527118e0f6fac, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 0
+  m_FillClockwise: 1
+  m_FillOrigin: 1
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fbDiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3067265402439781276
 GameObject:
   m_ObjectHideFlags: 0
@@ -3623,6 +3905,94 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &3810494978958161500
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7126573498188991861}
+  - component: {fileID: 1827009868446651818}
+  - component: {fileID: 8553142033615215066}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: icon_hui
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7126573498188991861
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3810494978958161500}
+  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: 4925541673947957992}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 80, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1827009868446651818
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3810494978958161500}
+  m_CullTransparentMesh: 1
+--- !u!114 &8553142033615215066
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3810494978958161500}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 2bb159c80d5218f4e8d527118e0f6fac, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 0
+  m_FillClockwise: 1
+  m_FillOrigin: 1
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_fb3401
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  packInfo:
+    packName: skillIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
+    lasetJsonGUID: b2843643b4298cdf1d66ce110c944378
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3864643238221401091
 GameObject:
   m_ObjectHideFlags: 0
@@ -5664,7 +6034,10 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7479615743388508295}
+  - {fileID: 8816216855009743864}
+  - {fileID: 7509376821817412047}
   - {fileID: 7833523249163798776}
+  - {fileID: 7126573498188991861}
   - {fileID: 2146270928697371138}
   - {fileID: 7255814566391051554}
   m_Father: {fileID: 866017355225982164}
@@ -5707,6 +6080,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: bg_hui
+    gameObject: {fileID: 7085004999276676131}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: icon_hui
+    gameObject: {fileID: 8553142033615215066}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &2400465450944708116
 MonoBehaviour:
@@ -5899,7 +6282,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.33962262, g: 0.33962262, b: 0.33962262, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -6501,7 +6884,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -7380,6 +7763,94 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7024122897744601800
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8866218788833705411}
+  - component: {fileID: 6163622132043819703}
+  - component: {fileID: 2054773142702067391}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_kuang
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8866218788833705411
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7024122897744601800}
+  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: 4197360294442415998}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 5}
+  m_SizeDelta: {x: 93, y: 130}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6163622132043819703
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7024122897744601800}
+  m_CullTransparentMesh: 1
+--- !u!114 &2054773142702067391
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7024122897744601800}
+  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.4012, g: 0.68, b: 0.5313067, 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: dec_fb_kuang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7190989899415035677
 GameObject:
   m_ObjectHideFlags: 0
@@ -7962,6 +8433,94 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7956961487383302577
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8095471689865712}
+  - component: {fileID: 7695338556935814868}
+  - component: {fileID: 4497466034855487779}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: icon_hui
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8095471689865712
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7956961487383302577}
+  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: 4197360294442415998}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 80, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7695338556935814868
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7956961487383302577}
+  m_CullTransparentMesh: 1
+--- !u!114 &4497466034855487779
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7956961487383302577}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 2bb159c80d5218f4e8d527118e0f6fac, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 1
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_fb3501
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  packInfo:
+    packName: skillIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
+    lasetJsonGUID: b2843643b4298cdf1d66ce110c944378
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7968806299161662357
 GameObject:
   m_ObjectHideFlags: 0
@@ -9278,7 +9837,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 80, y: 90}
+  m_SizeDelta: {x: 100, y: 140}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1606752382028469863
 CanvasRenderer:
@@ -9301,7 +9860,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.9254902}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -9315,17 +9874,17 @@ MonoBehaviour:
   m_FillMethod: 1
   m_FillAmount: 0
   m_FillClockwise: 0
-  m_FillOrigin: 0
+  m_FillOrigin: 1
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_fb3401
+  _icon_name: dec_fbDiban
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: skillIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
-    lasetJsonGUID: b2843643b4298cdf1d66ce110c944378
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Scripts/Core/Pool/GPool/ParticleSystemPool.cs

@@ -195,8 +195,8 @@ namespace Fort23.UTool
                 }
 
                 Particles[i].Stop();
-                Particles[i].Clear(true);
-                Particles[i].Play(true);
+                Particles[i].Clear(false);
+                Particles[i].Play(false);
             }
 
             if (DelayShows != null)
@@ -261,6 +261,10 @@ namespace Fort23.UTool
             {
                 delayTime = 30;
             }
+            else
+            {
+                delayTime = 2;
+            }
 
             if (currDelayTime < delayTime)
             {

Assets/Scripts/Core/UI/UTool/MyImage.cs

@@ -67,6 +67,7 @@ namespace UnityEngine.UI
         [SerializeField] public PackInfo packInfo;
 #endif
         private UILoadSpriteHand _uiLoadSpriteHand;
+        public float imageH;
 
         public System.Action onSpriteAlter;
 
@@ -83,6 +84,9 @@ namespace UnityEngine.UI
             }
         }
 
+     
+
+      
         protected override void OnDestroy()
         {
             if (_uiLoadSpriteHand != null)
@@ -309,7 +313,8 @@ namespace UnityEngine.UI
 
                     if (spriteMD5 == targetMD5)
                     {
-                        LogTool.Log($"找到匹配的 Sprite: {textrueJson.newTextureJson[i].textrueName}，所在图集: {allPackgInfo.packName}，源文件: {targetPath}");
+                        LogTool.Log(
+                            $"找到匹配的 Sprite: {textrueJson.newTextureJson[i].textrueName}，所在图集: {allPackgInfo.packName}，源文件: {targetPath}");
                         packInfo = allPackgInfo;
                         CurrSpriteAtlas = UGUICacheInfo.GetSpriteAtlas(allPackgInfo.packName);
                         icon_name = textrueJson.newTextureJson[i].textrueName;
@@ -426,13 +431,34 @@ namespace UnityEngine.UI
         protected override void OnPopulateMesh(VertexHelper vh)
         {
             base.OnPopulateMesh(vh);
-
-            if (!useGradient || vh.currentVertCount == 0)
-                return;
-
             List<UIVertex> verts = new List<UIVertex>();
             vh.GetUIVertexStream(verts);
+            if (imageH <= 0)
+            {
+                float minY = 11111;
+                float maxY = -111111;
+             
+                for (int i = 0; i < verts.Count; i++)
+                {
+                    UIVertex vertex = verts[i];
+                    float y = vertex.position.y;
+                    if (y < minY)
+                    {
+                        minY = y;
+                    }
 
+                    if (y > maxY)
+                    {
+                        maxY = y;
+                    }
+                }
+
+                imageH = maxY - minY;
+            }
+
+            if (!useGradient || vh.currentVertCount == 0)
+                return;
+            
             for (int i = 0; i < verts.Count; i += 6)
             {
                 ApplyGradientToQuad(verts, i);

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

@@ -32,7 +32,7 @@ namespace GameLogic.Combat.CombatState
             CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
             if (playerHeroEntity != null)
             {
-                playerHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Flight);
+                playerHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Flight,isQiangZhi:true);
                 playerHeroEntity.CurrCombatHeroInfo.Shield = playerHeroEntity.MaxCombatHeroInfo.Shield;
                 CombatCalculateTool.Instance.Recover(playerHeroEntity,
                     playerHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), 999999, AttType.Normal, HarmType.Default,

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

@@ -234,9 +234,12 @@ namespace GameLogic.Combat.Hero
                 if (b1008 == null)
                 {
                     cd -= t;
-                    if (_rootMagicWeaponControl.isAutoUse && IsCanUse())
+                    if ( IsCanUse())
                     {
-                        UseMagicWeapon();
+                        if (_rootMagicWeaponControl.isAutoUse && cd < -1f)//自动的延迟一秒释放
+                        {
+                            UseMagicWeapon();
+                        }
                     }
                 }
             }

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

@@ -74,7 +74,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             
             BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
             cBetterList.Add(lifetCycleHitPoint);
-            ActivationTimeLineData("gongji", currTarget: cBetterList);
+            ActivationTimeLineData("sk1_hit", currTarget: cBetterList);
             SkillPlayFinish();
             
             // HarmReturnInfo harmReturnInfo = CObjectPool.Instance.Fetch<HarmReturnInfo>();

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

@@ -105,7 +105,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
             BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
             cBetterList.Add(lifetCycleHitPoint);
-            ActivationTimeLineData("gongji", currTarget: cBetterList);
+            ActivationTimeLineData("sk1_hit", currTarget: cBetterList);
             SkillPlayFinish();
             // TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic =
             //     ActivationTimeLineData("sk1_xiaoshi");

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

@@ -2,9 +2,11 @@ using Common.Utility.CombatEvent;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -13,6 +15,15 @@ namespace Fort23.Mono
     {
         private CombatMagicWeaponEntity combatMagicWeaponEntity;
 
+        private bool isChargedFinish;
+
+        private bool isForewarn;
+
+        private ParticleSystemPool noshifang;
+
+        private ParticleSystemPool chargedFinish;
+
+        // private ParticleSystemPool chargedFinish;
         private void Init()
         {
         }
@@ -21,6 +32,7 @@ namespace Fort23.Mono
         {
             StaticUpdater.Instance.AddLateUpdateCallBack(Update);
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseMagicWeapon, UseMagicWeapon);
             CombatEventManager.Instance.AddEventListener(CombatEventType.RemoveBuff, RemoveBuff);
         }
 
@@ -29,9 +41,20 @@ namespace Fort23.Mono
         {
             StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseMagicWeapon, UseMagicWeapon);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.RemoveBuff, RemoveBuff);
         }
 
+        private void UseMagicWeapon(IEventData iEventData)
+        {
+            UseMagicWeaponEventData useMagicWeaponEventData = iEventData as UseMagicWeaponEventData;
+            if (useMagicWeaponEventData.combatMagicWeaponEntity == combatMagicWeaponEntity)
+            {
+                GObjectPool.Instance.Recycle(chargedFinish);
+                chargedFinish = null;
+            }
+        }
+
         private void AddBuff(IEventData iEventData)
         {
             BuffEventData buffEventData = iEventData as BuffEventData;
@@ -39,7 +62,15 @@ namespace Fort23.Mono
             {
                 if (buffEventData.BuffBasic is b_1008)
                 {
-                    feng.SetActive(true);
+                    GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_Noshifang",
+                        delegate(ParticleSystemPool pool)
+                        {
+                            pool.transform.SetParent(transform);
+                            pool.transform.localPosition = new Vector3(0, 0, 0);
+                            pool.transform.SetAsLastSibling();
+                            noshifang = pool;
+                        });
+                    // feng.SetActive(true);
                 }
             }
         }
@@ -51,7 +82,8 @@ namespace Fort23.Mono
             {
                 if (buffEventData.BuffBasic is b_1008)
                 {
-                    feng.SetActive(false);
+                    GObjectPool.Instance.Recycle(noshifang);
+                    noshifang = null;
                 }
             }
         }
@@ -88,7 +120,9 @@ namespace Fort23.Mono
 
         public void InitWidget(CombatMagicWeaponEntity combatMagicWeaponEntity)
         {
-            feng.SetActive(false);
+            noshifang = null;
+            chargedFinish = null;
+            // feng.SetActive(false);
             this.combatMagicWeaponEntity = combatMagicWeaponEntity;
         }
 
@@ -102,7 +136,39 @@ namespace Fort23.Mono
             float d =
                 (combatMagicWeaponEntity.cd + combatMagicWeaponEntity.RootMagicWeaponControl.globalMagicWeaponCd) /
                 (combatMagicWeaponEntity.MaxCd);
-            cd.fillAmount = 1 - d;
+            float max = 140;
+            float spMax = 80;
+            float a = (max - spMax) / 2 / max;
+            float startA = 1 - a;
+            float fa = 1 - ((startA - d) / (startA - a));
+            float y = icon_hui.imageH;
+            icon_hui.fillAmount = fa;
+            bg_hui.fillAmount = d;
+            // bg_.fillAmount = d;
+            if (combatMagicWeaponEntity.cd < 1 && !isForewarn)
+            {
+                isForewarn = true;
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_gw_Starshifang",
+                    delegate(ParticleSystemPool pool)
+                    {
+                        pool.transform.SetParent(transform);
+                        pool.transform.localPosition = new Vector3(0, 0, 0);
+                        pool.transform.SetAsLastSibling();
+                    });
+            }
+
+            if (!isChargedFinish && combatMagicWeaponEntity.cd <= 0)
+            {
+                isChargedFinish = true;
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_shifang",
+                    delegate(ParticleSystemPool pool)
+                    {
+                        pool.transform.SetParent(transform);
+                        pool.transform.localPosition = new Vector3(0, 0, 0);
+                        pool.transform.SetSiblingIndex(3);
+                        chargedFinish = pool;
+                    });
+            }
         }
     }
 }

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

@@ -52,6 +52,39 @@ namespace Fort23.Mono
 	      return _feng;
 	     }
 	   }
+	  private MyImage _fb_kuang;
+	  public MyImage fb_kuang
+	   {
+	   get{
+	      if (_fb_kuang == null)
+	       {
+	         _fb_kuang  = GetUIUnit<MyImage>("fb_kuang"); 
+	       }
+	      return _fb_kuang;
+	     }
+	   }
+	  private MyImage _icon_hui;
+	  public MyImage icon_hui
+	   {
+	   get{
+	      if (_icon_hui == null)
+	       {
+	         _icon_hui  = GetUIUnit<MyImage>("icon_hui"); 
+	       }
+	      return _icon_hui;
+	     }
+	   }
+	  private MyImage _bg_hui;
+	  public MyImage bg_hui
+	   {
+	   get{
+	      if (_bg_hui == null)
+	       {
+	         _bg_hui  = GetUIUnit<MyImage>("bg_hui"); 
+	       }
+	      return _bg_hui;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -26,6 +26,8 @@ namespace Fort23.Mono
         private ParticleSystemPool fx_ui_zhuangPan;
         public async CTask ShowPanel()
         {
+            GObjectPool.Instance.DormancyPool<ParticleSystemPool>("fx_ui_fb_shifang");
+            GObjectPool.Instance.DormancyPool<ParticleSystemPool>("fx_ui_fb_Noshifang");
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
             cTaskAwaitBuffer.AddTask(
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_jin_tw", Prestore: true));
@@ -37,6 +39,12 @@ namespace Fort23.Mono
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_huo_tw", Prestore: true));
             cTaskAwaitBuffer.AddTask(
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_tu_tw", Prestore: true));
+            cTaskAwaitBuffer.AddTask(
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_shifang", Prestore: true));
+            cTaskAwaitBuffer.AddTask(
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_Noshifang", Prestore: true));
+            cTaskAwaitBuffer.AddTask(
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_gw_Starshifang", Prestore: true));
             cTaskAwaitBuffer.AddTask(
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_zhuanpanBuff_xingchendao",
                     delegate(ParticleSystemPool pool)