修改bug

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.22632939
+    - _Alpha: 0.7346555
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.00083965063
+    - _Alpha: 0.5297624
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/UI/CombatHPPanel.prefab

@@ -175,7 +175,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -362,7 +362,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -811,7 +811,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -959,7 +959,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/CombatShowTextPanel.prefab

@@ -416,7 +416,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2899811732826681524
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -1043,6 +1043,8 @@ RectTransform:
   m_Children:
   - {fileID: 567943526521562570}
   - {fileID: 8707292690727122296}
+  - {fileID: 5271571642861539703}
+  - {fileID: 8709312219705095132}
   m_Father: {fileID: 5280865914155831809}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2442,6 +2444,51 @@ MonoBehaviour:
     m_MipBias: 0
     m_VarianceClampScale: 0.9
     m_ContrastAdaptiveSharpening: 0
+--- !u!1 &4227657418625520249
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8709312219705095132}
+  - component: {fileID: 176138422089921819}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: hpPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8709312219705095132
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4227657418625520249}
+  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: 389517420566117365}
+  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: 21.3}
+  m_SizeDelta: {x: 18.6795, y: 18.6795}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &176138422089921819
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4227657418625520249}
+  m_CullTransparentMesh: 1
 --- !u!1 &4281577467950441886
 GameObject:
   m_ObjectHideFlags: 0
@@ -4510,6 +4557,102 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1.18, y: -2.87}
   m_UseGraphicAlpha: 1
+--- !u!1 &7835945120340221252
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5271571642861539703}
+  - component: {fileID: 3934105595951109144}
+  - component: {fileID: 1277718969084704392}
+  - component: {fileID: 3782048555679544397}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Hp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5271571642861539703
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7835945120340221252}
+  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: 389517420566117365}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3934105595951109144
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7835945120340221252}
+  m_CullTransparentMesh: 1
+--- !u!114 &1277718969084704392
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7835945120340221252}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 200/200
+--- !u!114 &3782048555679544397
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7835945120340221252}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &8133115195657394689
 GameObject:
   m_ObjectHideFlags: 0
@@ -5231,6 +5374,36 @@ MonoBehaviour:
     - gameObject: {fileID: 7376704574898062582}
     - gameObject: {fileID: 5361362261105901452}
     - gameObject: {fileID: 3729610520836463702}
+  - key: Text_Hp
+    gameObject: {fileID: 1277718969084704392}
+    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: hpPos
+    gameObject: {fileID: 8709312219705095132}
+    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 &2752137599948016585
 PrefabInstance:

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

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

@@ -337,9 +337,23 @@ namespace Fort23.Mono
             HeroAttributeWidgets.Clear();
         }
 
+        List<ShowTextWidget> showTextWidgets = new List<ShowTextWidget>();
+
         public async CTask Dujie(int hart)
         {
             root.SetActive(false);
+            using (CTaskAwaitBuffer<ShowTextWidget> cTaskAwaitBuffer = new CTaskAwaitBuffer<ShowTextWidget>())
+            {
+                for (int i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2]; i++)
+                {
+                    cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponentForObject<ShowTextWidget>(
+                        ShowTextWidgetGam, null, transform, isInstance: true));
+                }
+
+                showTextWidgets = await cTaskAwaitBuffer.WaitAll();
+            }
+
+
             DujiePanelAnim.Play("guodu");
             fx_ui_dujie_guodu.gameObject.SetActive(true);
             fx_ui_dujie_hun.gameObject.SetActive(true);
@@ -348,21 +362,25 @@ namespace Fort23.Mono
             long hp = PlayerManager.Instance.myHero.hp.Value;
 
             Slider_Hp.maxValue = PlayerManager.Instance.myHero.hp.Value;
+            Text_Hp.text = $"{hp}/{hp}";
 
 
             await TimerComponent.Instance.WaitAsync(1000);
             Slider_Hp.gameObject.SetActive(true);
 
 
-            int h = hart /   PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2];
-            for (int i = 0; i <   PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2]; i++)
+            int h = hart / PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2];
+            for (int i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2]; i++)
             {
                 fx_ui_dujie_sd.gameObject.SetActive(true);
                 fx_ui_dujie_sd.Play();
                 await TimerComponent.Instance.WaitAsync(200);
-                CreatShowTextWidgetGam(h);
+                showTextWidgets[i].ShowUI(hpPos.transform.position, -h, HarmType.Default, false);
+     
                 hp -= h;
+                hp = hp < 0 ? 0 : hp;
                 Slider_Hp.value = hp;
+                Text_Hp.text = $"{hp}/{PlayerManager.Instance.myHero.hp.Value}";
                 await TimerComponent.Instance.WaitAsync(1000);
             }
 
@@ -373,15 +391,6 @@ namespace Fort23.Mono
             Slider_Hp.gameObject.SetActive(false);
         }
 
-        private async void CreatShowTextWidgetGam(int h)
-        {
-            Vector3 worldPos = Slider_Hp.transform.position;
-            ShowTextWidget widget =
-                await UIManager.Instance.CreateGComponentForObject<ShowTextWidget>(ShowTextWidgetGam, null,
-                    transform,
-                    isInstance: true);
-            widget.ShowUI(worldPos, -h, HarmType.Default, false);
-        }
 
         public async CTask RecoverDujie()
         {

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

@@ -296,6 +296,28 @@ namespace Fort23.Mono
 	      return _ShowTextWidgetGam;
 	     }
 	   }
+	  private Text _Text_Hp;
+	  public Text Text_Hp
+	   {
+	   get{
+	      if (_Text_Hp == null)
+	       {
+	         _Text_Hp  = GetUIUnit<Text>("Text_Hp"); 
+	       }
+	      return _Text_Hp;
+	     }
+	   }
+	  private RectTransform _hpPos;
+	  public RectTransform hpPos
+	   {
+	   get{
+	      if (_hpPos == null)
+	       {
+	         _hpPos  = GetUIUnit<RectTransform>("hpPos"); 
+	       }
+	      return _hpPos;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{