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

Assets/Res/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset

@@ -14,7 +14,25 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Line:
     serializedVersion: 2
-    m_Curve: []
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 1
+      outSlope: 1
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 1
+      outSlope: 1
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4

Assets/Res/UI/HeroInformainPanel/ExpElixirItemWidget.prefab

@@ -11,6 +11,8 @@ GameObject:
   - component: {fileID: 613822628101747441}
   - component: {fileID: 2601696344394936796}
   - component: {fileID: 6403288296177001303}
+  - component: {fileID: 690890871031624571}
+  - component: {fileID: 8594232099836062120}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage
@@ -38,7 +40,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 2, y: -49.094}
-  m_SizeDelta: {x: 104, y: 25}
+  m_SizeDelta: {x: 0, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2601696344394936796
 CanvasRenderer:
@@ -55,7 +57,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 727090394113027384}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -86,11 +88,51 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 25
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &690890871031624571
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 727090394113027384}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &8594232099836062120
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 727090394113027384}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 7.26
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &1864377170952607150
 GameObject:
   m_ObjectHideFlags: 0
@@ -167,15 +209,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_4_3
+  _icon_name: icon_Gem_Star_Blue
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
-  imageH: 0
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 1d33824861d7fb9fd50c0d939197e59c
+  imageH: 76.795296
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -239,7 +281,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.21568629, g: 0.27450982, b: 0.19215688, a: 1}
+  m_Color: {r: 0.9450981, g: 0.8941177, b: 0.8196079, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -296,6 +338,7 @@ RectTransform:
   - {fileID: 3815570585468557903}
   - {fileID: 3836045959441187368}
   - {fileID: 613822628101747441}
+  - {fileID: 7341028841268886967}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -344,6 +387,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: fx_ui_danyao_qi
+    gameObject: {fileID: 2359446088588135187}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5494259865384876045
 GameObject:
@@ -509,7 +557,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
-  imageH: 0
+  imageH: 173
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -568,7 +616,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8277801656151762346}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -599,7 +647,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 23
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -615,6 +663,7 @@ GameObject:
   - component: {fileID: 3689453126699807888}
   - component: {fileID: 7796567445027890541}
   - component: {fileID: 2490629156040680867}
+  - component: {fileID: 6852921797108230288}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_ExpDesc
@@ -637,10 +686,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 613822628101747441}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 9.821995, y: 0}
-  m_SizeDelta: {x: -24.113, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 43.997498, y: -12.5}
+  m_SizeDelta: {x: 24, y: 23.1372}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7796567445027890541
 CanvasRenderer:
@@ -684,6 +733,20 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: +10
+--- !u!114 &6852921797108230288
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8391670725414584427}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &8990316361952907788
 GameObject:
   m_ObjectHideFlags: 0
@@ -717,10 +780,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 613822628101747441}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 4.3, y: 0}
-  m_SizeDelta: {x: 17.5789, y: 19.9228}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 24.7375, y: 24.7375}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &567501161108577294
 CanvasRenderer:
@@ -758,18 +821,193 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
-  m_UseSpriteMesh: 0
+  m_UseSpriteMesh: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_zhujiao
+  _icon_name: icon_Gem_Star_Blue
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: b2f66576a0322eca4f466600e3b8eb35
-  imageH: 0
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 1d33824861d7fb9fd50c0d939197e59c
+  imageH: 19.9228
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1001 &1365650245290411718
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7572434834171745595}
+    m_Modifications:
+    - target: {fileID: 269585019729688745, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 269585019729688745, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3470768211459733579, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_danyao_qi
+      objectReference: {fileID: 0}
+    - target: {fileID: 3470768211459733579, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3624742523795066325, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_Particles.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3624742523795066325, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_Particles.Array.data[1]
+      value: 
+      objectReference: {fileID: 6744311576022260575}
+    - target: {fileID: 3624742523795066325, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_Particles.Array.data[2]
+      value: 
+      objectReference: {fileID: 1908756491430545963}
+    - target: {fileID: 4555415588630463550, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4555415588630463550, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6825101046639632279, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6825101046639632279, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -2.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 20.830872
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+--- !u!198 &1908756491430545963 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 616571228131790061, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+  m_PrefabInstance: {fileID: 1365650245290411718}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &2359446088588135187 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3624742523795066325, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+  m_PrefabInstance: {fileID: 1365650245290411718}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!198 &6744311576022260575 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 5722764562796207513, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+  m_PrefabInstance: {fileID: 1365650245290411718}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &7341028841268886967 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8580291323864513393, guid: 7f8f24cc71979424f921614801a58520, type: 3}
+  m_PrefabInstance: {fileID: 1365650245290411718}
+  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -2318,6 +2318,43 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &3611302445930086335
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3715210936838745054}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: fxroot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3715210936838745054
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3611302445930086335}
+  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: 5810333808550360464}
+  m_Father: {fileID: 2859865283014944201}
+  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.5, y: -84.2}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3886282185563919857
 GameObject:
   m_ObjectHideFlags: 0
@@ -2854,6 +2891,7 @@ RectTransform:
   - {fileID: 1177809280148261388}
   - {fileID: 1155106644705196333}
   - {fileID: 871529640652062368}
+  - {fileID: 3715210936838745054}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -5447,6 +5485,36 @@ MonoBehaviour:
     - gameObject: {fileID: 7376704574898062582}
     - gameObject: {fileID: 5361362261105901452}
     - gameObject: {fileID: 3729610520836463702}
+  - key: fxroot
+    gameObject: {fileID: 3715210936838745054}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
+  - key: fx_ui_danyao_shi
+    gameObject: {fileID: 6319441950228226556}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
   isAssetBundle: 1
 --- !u!1001 &508761963476317887
 PrefabInstance:
@@ -6142,6 +6210,167 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 1995233134475489019, guid: cec2b3bb297134d419166bf0c251253f, type: 3}
   m_PrefabInstance: {fileID: 2375979000573420194}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2421413929981742953
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 3715210936838745054}
+    m_Modifications:
+    - target: {fileID: 1811460947301675568, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1811460947301675568, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3382868508766526007, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3382868508766526007, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5007760550118055448, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5007760550118055448, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7254282868981543993, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_danyao_shi
+      objectReference: {fileID: 0}
+    - target: {fileID: 7254282868981543993, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7827405478946672956, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7827405478946672956, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+--- !u!224 &5810333808550360464 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8158522460055583481, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+  m_PrefabInstance: {fileID: 2421413929981742953}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &6319441950228226556 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8514545319096135317, guid: 70d8304dee4e2864d8ad797849cca684, type: 3}
+  m_PrefabInstance: {fileID: 2421413929981742953}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &2752137599948016585
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/UseExpElixirPanel.prefab

@@ -37,8 +37,8 @@ RectTransform:
   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: 7.9, y: -213.24207}
-  m_SizeDelta: {x: 664.4571, y: 405.1165}
+  m_AnchoredPosition: {x: 7.9, y: -310.30414}
+  m_SizeDelta: {x: 664.4571, y: 394.7434}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5757431903831117913
 CanvasRenderer:
@@ -297,8 +297,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 110.00647}
-  m_SizeDelta: {x: 0, y: 419.0444}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 496}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &524714867080188752
 CanvasRenderer:
@@ -321,7 +321,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.79215693, g: 0.87843144, b: 0.8431373, a: 1}
+  m_Color: {r: 0.12941177, g: 0.24705884, b: 0.24705884, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -510,10 +510,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
+    m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -521,7 +521,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1.2
-  m_Text: "\u4ECA\u65E5\n0/20"
+  m_Text: "\u4ECA\u65E5\n20/20"
 --- !u!1 &7308605241962880610
 GameObject:
   m_ObjectHideFlags: 0
@@ -761,7 +761,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0.6, y: 57.1}
+  m_AnchoredPosition: {x: -0.6, y: -3.5999756}
   m_SizeDelta: {x: 100, y: 104}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7893086648743390479

Assets/Scripts/Core/Curve/ACurve.cs

@@ -36,12 +36,14 @@ namespace CombatLibrary.CombatLibrary.CombatCore.Utility
                 case CurveType.BSL:
                     return BSL(t);
                     break;
+                case CurveType.Linear:
+                    return Linear(t);
             }
 
             return 0;
         }
 
-        public Vector2 EvaluateForVector2(float t,float currTime)
+        public Vector2 EvaluateForVector2(float t, float currTime)
         {
             if (CurveInfos == null)
             {
@@ -56,17 +58,100 @@ namespace CombatLibrary.CombatLibrary.CombatCore.Utility
             switch (CurveType)
             {
                 // case CurveType.HYT:
-                //     // return HYT(t);
+                //     return HYT(t);
                 //     break;
+                case CurveType.Linear:
+                    return LinearForVector2(t, currTime);
                 case CurveType.BSL:
                     return BSLForVector2(t, currTime);
-                    break;
             }
 
             return new Vector2();
         }
 
-        private Vector2 BSLForVector2(float t,float currTime)
+
+        // 一维线性插值
+        private float Linear(float t)
+        {
+            CurveInfo c1 = default;
+            CurveInfo c2 = default;
+
+            // 查找当前t所在的区间
+            for (int i = 0; i < CurveInfos.Count; i++)
+            {
+                if (CurveInfos[i].t > t)
+                {
+                    int lindex = i - 1;
+                    if (lindex < 0)
+                    {
+                        return (float)CurveInfos[i].v;
+                    }
+
+                    c1 = CurveInfos[i - 1];
+                    c2 = CurveInfos[i];
+                    break;
+                }
+            }
+
+            // 如果t超过最后一个点，返回最后一个点的值
+            if (c2.t == 0)
+            {
+                return (float)CurveInfos[^1].v;
+            }
+
+            // 线性插值计算
+            float timeRange = (float)(c2.t - c1.t);
+            float valueRange = (float)(c2.v - c1.v);
+            float normalizedTime = (t - (float)c1.t) / timeRange;
+
+            return (float)c1.v + valueRange * normalizedTime;
+        }
+
+        // 二维线性插值
+        private Vector2 LinearForVector2(float t, float currTime)
+        {
+            CurveInfo c1 = default;
+            CurveInfo c2 = default;
+
+            // 查找当前currTime所在的区间
+            for (int i = 0; i < CurveInfos.Count; i++)
+            {
+                if (CurveInfos[i].t > currTime)
+                {
+                    int lindex = i - 1;
+                    if (lindex < 0)
+                    {
+                        CurveInfo endInfo = CurveInfos[i];
+                        return new Vector2((float)endInfo.t, (float)endInfo.v);
+                    }
+
+                    c1 = CurveInfos[i - 1];
+                    c2 = CurveInfos[i];
+                    break;
+                }
+            }
+
+            // 如果currTime超过最后一个点，返回最后一个点的值
+            if (c2.t == 0)
+            {
+                CurveInfo endInfo = CurveInfos[^1];
+                return new Vector2((float)endInfo.t, (float)endInfo.v);
+            }
+
+            // 线性插值计算
+            float timeRange = (float)(c2.t - c1.t);
+            float xRange = (float)(c2.t - c1.t);
+            float yRange = (float)(c2.v - c1.v);
+            float normalizedTime = (currTime - (float)c1.t) / timeRange;
+
+            float x = (float)c1.t + xRange * normalizedTime;
+            float y = (float)c1.v + yRange * normalizedTime;
+
+            return new Vector2(x, y);
+        }
+
+
+        private Vector2 BSLForVector2(float t, float currTime)
         {
             CurveInfo c1 = default;
             CurveInfo c2 = default;
@@ -88,7 +173,7 @@ namespace CombatLibrary.CombatLibrary.CombatCore.Utility
                 }
             }
 
-            if (c2.t==0)
+            if (c2.t == 0)
             {
                 CurveInfo endInfo = CurveInfos[^1];
                 Vector2 endPos = new Vector2(endInfo.t, endInfo.v);

Assets/Scripts/Core/Curve/CurveType.cs

@@ -4,5 +4,6 @@
     {
         HYT,
         BSL,
+        Linear
     }
 }

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

@@ -9,7 +9,7 @@ public class ImageMoveContainer
     protected List<ImageMove> allImageMove = new List<ImageMove>();
 
 
-    public void AddACurve(Vector2 startPos, Vector2 target, float delay, float speed, GameObjectPool gameObjectPool,
+    public void AddACurve(Vector2 startPos, Vector2 target, float delay, float speed, GameObjectPool gameObjectPool,System.Action<ImageMove> finishCallBack = null,
         AnimationCurve ui_showSize = null, AnimationCurve ui_moveSize = null, AnimationCurve ui_moveSpped = null)
     {
         ACurve aCurve = new ACurve();
@@ -38,27 +38,28 @@ public class ImageMoveContainer
         aCurve.CurveInfos = new List<CurveInfo>();
         aCurve.CurveInfos.Add(curveInfo);
         aCurve.CurveInfos.Add(curveInfo2);
-        aCurve.CurveType = CurveType.BSL;
+        aCurve.CurveType = CurveType.Linear;
         ImageMove currImageMove = new ImageMove();
         currImageMove.SizeCurve = ui_moveSize;
         currImageMove.moveSpeed = ui_moveSpped;
-        // currImageMove.ShowSizeCurve = ui_showSize;
-        // currImageMove.showSizeSpeed = 10;
-        // GameObjectPool gameObjectPool =
-        //     GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(moveIcon, "moveIcon");
+ 
         gameObjectPool.own.SetActive(false);
         currImageMove.GameObjectPool = gameObjectPool;
-        // gameObjectPool.own.GetComponent<Image>().icon_name = itemConfig.icon;
+    
         currImageMove.transform = gameObjectPool.own.GetComponent<RectTransform>();
         currImageMove.moveStartPos = startPos;
 
-        // currImageMove.transform.SetParent(root);
+
         currImageMove.transform.anchoredPosition = currImageMove.moveStartPos;
         currImageMove.yanChi = delay;
         currImageMove.speed = speed;
         currImageMove.currAcur = aCurve;
+        currImageMove.finishCallBack = finishCallBack;
 
         allImageMove.Add(currImageMove);
+        
+        StaticUpdater.Instance.RemoveRenderUpdateCallBack(RenderUpdateCallBack);
+        StaticUpdater.Instance.AddRenderUpdateCallBack(RenderUpdateCallBack);
     }
 
     public void RenderUpdateCallBack()
@@ -68,8 +69,9 @@ public class ImageMoveContainer
             ImageMove imageMove = allImageMove[i];
             if (imageMove.Update())
             {
-                allImageMove.RemoveAt(i);
-                imageMove.GameObjectPool.own.SetActive(false);
+                Dispose();
+                // allImageMove.RemoveAt(i);
+                // imageMove.GameObjectPool.own.SetActive(false);
                 i--;
             }
         }
@@ -84,5 +86,6 @@ public class ImageMoveContainer
             allImageMove.RemoveAt(i);
             i--;
         }
+        StaticUpdater.Instance.RemoveRenderUpdateCallBack(RenderUpdateCallBack);
     }
 }

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

@@ -48,5 +48,11 @@ namespace Fort23.Mono
             Text_ExpDesc.text = $"+{ItemConfig.associateVlaue[0]}EXP";
             Text_ItemCount.text = PlayerManager.Instance.BagController.GetItemCount(itemId).ToString();
         }
+
+        public override void DormancyObj()
+        {
+            fx_ui_danyao_qi.gameObject.SetActive(false);
+            base.DormancyObj();
+        }
     }
 }

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

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using Coffee.UIExtensions;
+
 namespace Fort23.Mono
 {
 	public partial class ExpElixirItemWidget 
@@ -52,6 +54,17 @@ namespace Fort23.Mono
 	      return _Text_ItemCount;
 	     }
 	   }
+	  private UIParticle _fx_ui_danyao_qi;
+	  public UIParticle fx_ui_danyao_qi
+	   {
+	   get{
+	      if (_fx_ui_danyao_qi == null)
+	       {
+	         _fx_ui_danyao_qi  = GetUIUnit<UIParticle>("fx_ui_danyao_qi"); 
+	       }
+	      return _fx_ui_danyao_qi;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -340,6 +340,28 @@ namespace Fort23.Mono
 	      return _fx_ui_tupo_loop;
 	     }
 	   }
+	  private RectTransform _fxroot;
+	  public RectTransform fxroot
+	   {
+	   get{
+	      if (_fxroot == null)
+	       {
+	         _fxroot  = GetUIUnit<RectTransform>("fxroot"); 
+	       }
+	      return _fxroot;
+	     }
+	   }
+	  private UIParticle _fx_ui_danyao_shi;
+	  public UIParticle fx_ui_danyao_shi
+	   {
+	   get{
+	      if (_fx_ui_danyao_shi == null)
+	       {
+	         _fx_ui_danyao_shi  = GetUIUnit<UIParticle>("fx_ui_danyao_shi"); 
+	       }
+	      return _fx_ui_danyao_shi;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -5,6 +5,8 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
+using UnityEngine;
+using Utility.CTween;
 
 namespace Fort23.Mono
 {
@@ -15,8 +17,14 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            isPopUi = true;
-            isAddStack = false;
+            // isPopUi = true;
+            isAddStack = true;
+        }
+
+        public override CTask GetFocus()
+        {
+            AppBarPanel.OpenPanel(this);
+            return base.GetFocus();
         }
 
         protected override void AddEvent()
@@ -35,7 +43,8 @@ namespace Fort23.Mono
         public async void CustomInit()
         {
             List<ItemConfig> itemConfigs = ConfigComponent.Instance.GetAll<ItemConfig>().ToList();
-            List<ItemConfig> itemConfigs2 = itemConfigs.Where(i => i.itemTag == 5 && PlayerManager.Instance.BagController.IsEnough(i.ID,1)).ToList();
+            List<ItemConfig> itemConfigs2 = itemConfigs
+                .Where(i => i.itemTag == 5 && PlayerManager.Instance.BagController.IsEnough(i.ID, 1)).ToList();
             foreach (var itemConfig in itemConfigs2)
             {
                 ExpElixirItemWidget elixirItemWidget =
@@ -48,7 +57,7 @@ namespace Fort23.Mono
             Text_UseCount.text = $"今日\n{AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount}/20";
         }
 
-        private void OnClick(ItemWidgetBasic obj)
+        private async void OnClick(ItemWidgetBasic obj)
         {
             ExpElixirItemWidget elixirItemWidget = obj as ExpElixirItemWidget;
             if (AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount >= 20)
@@ -70,6 +79,37 @@ namespace Fort23.Mono
                 return;
             }
 
+            elixirItemWidget.fx_ui_danyao_qi.gameObject.SetActive(true);
+            elixirItemWidget.fx_ui_danyao_qi.Play();
+
+
+            // CustomTweenManager.To()
+            HeroInformationPanel heroInformationPanel = UIManager.Instance.GetComponent<HeroInformationPanel>();
+            // ImageMoveContainer imageMoveContainer = new ImageMoveContainer();
+            GameObjectPool gameObjectPool = null;
+            gameObjectPool = await GObjectPool.Instance.FetchAsync<GameObjectPool>("fx_ui_danyao_tw");
+            gameObjectPool.own.transform.SetParent(this.transform);
+            // gameObjectPool.own.transform.GetComponent<RectTransform>().anchoredPosition = transform.worldToLocalMatrix *
+            //     elixirItemWidget.fx_ui_danyao_qi.transform.position;
+
+            Vector2 pos = transform.worldToLocalMatrix * elixirItemWidget.fx_ui_danyao_qi.transform.position;
+            Vector2 pos1 = transform.worldToLocalMatrix *
+                           heroInformationPanel.fxroot.GetComponent<RectTransform>().position;
+            gameObjectPool.own.GetComponent<RectTransform>().anchoredPosition = pos;
+            // imageMoveContainer.AddACurve(pos, pos1, 0, 1.5f, gameObjectPool, (i) =>
+            // {
+            //     heroInformationPanel.fx_ui_danyao_shi.gameObject.SetActive(true);
+            //     heroInformationPanel.fx_ui_danyao_shi.Play();
+            // });
+            CustomTweenManager
+                .To(() => pos, x => gameObjectPool.own.transform.GetComponent<RectTransform>().anchoredPosition = x,
+                    pos1, 0.5f, gameObjectPool.own)
+                .SetEase(CustomTweenEX.CustomAnimationCurve.Line).SetLoop(false).OnCompleteAction = () =>
+            {
+                GObjectPool.Instance.Recycle(gameObjectPool);
+                heroInformationPanel.fx_ui_danyao_shi.gameObject.SetActive(true);
+                heroInformationPanel.fx_ui_danyao_shi.Play();
+            };
             Text_UseCount.text = $"今日\n{AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount}/20";
         }