Merge pull request '修理漏洞1010' (#207) from dev45-1007_2 into dev45-0703NewVer

Reviewed-on: #207

ColorlessWorld-2024-4-2/Assets/Particle Eff/Z_Scripts_45/AttackPreView.cs

@@ -13,10 +13,22 @@ public class AttackPreView : MonoBehaviour
 
     private void Start()
     {
-        if(AttackScorManager .Instance != null )
+        AttackScorManager.Instance.AttackPreView = this;
+       // StartCoroutine(resigt());
+    }
+
+    IEnumerator resigt()
+    {
+        yield return new WaitForSeconds(1f);
+        if (AttackScorManager.Instance != null && AttackScorManager.Instance.AttackPreView != null)
         {
+            Debug.Log("preÎÞ");
             AttackScorManager.Instance.AttackPreView = this;
         }
+        else
+        {
+            Debug.Log("preÓÐ");
+        }
     }
     public void LeftBoom()
     {

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -17758,6 +17758,7 @@ MonoBehaviour:
   infightMapComplete: 1
   setting: {fileID: 899243179}
   bag: {fileID: 1088130365}
+  smallHPBar: {fileID: 1973628369}
 --- !u!114 &301433367
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -47114,6 +47115,7 @@ MonoBehaviour:
   isScorSettle: 1
   isWeaponSettle: 1
   isSyncWeaponNodePos: 1
+  isShowSmallHPBar: 0
 --- !u!1 &701075509
 GameObject:
   m_ObjectHideFlags: 0
@@ -62306,6 +62308,7 @@ MonoBehaviour:
   infightMapComplete: 1
   setting: {fileID: 1296022613}
   bag: {fileID: 0}
+  smallHPBar: {fileID: 0}
 --- !u!114 &951356942
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -131145,7 +131148,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1939047898}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b67420b3567c470478476514f822f194, type: 3}
   m_Name: 
@@ -141342,6 +141345,7 @@ MonoBehaviour:
   infightMapComplete: 1
   setting: {fileID: 0}
   bag: {fileID: 0}
+  smallHPBar: {fileID: 0}
 --- !u!114 &2074933907
 MonoBehaviour:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Scripts/JumpInScenc/RegisteJumpInScenceCamera.cs

@@ -14,7 +14,8 @@ public class RegisteJumpInScenceCamera : MonoBehaviour
     public bool isWeaponSettle = false;
     [Header("控制是否进行武器节点位置同步")]
     public bool isSyncWeaponNodePos = true;
-
+    [Header("控制小血条是否显示")]
+    public bool isShowSmallHPBar = true;
     private void Start()
     {
         //设置ui界面相机和隐藏或者展示
@@ -28,6 +29,9 @@ public class RegisteJumpInScenceCamera : MonoBehaviour
         PlayerStatusUIManager.Instance.infightMapComplete = false;
         //设置是否同步武器节点位置
         BagManager.Instance.isSyncWeapoNodePos = isSyncWeaponNodePos;
+        //控制小血条是否显示
+        PlayerStatusUIManager.Instance.smallHPBar.SetActive(isShowSmallHPBar);
+
         /* if(JumpInScenceManager .Instance != null )
          {
              JumpInScenceManager.Instance.cameraTrans = this.gameObject.transform;

ColorlessWorld-2024-4-2/Assets/Scripts/UI/PlayerStatusUIManager.cs

@@ -12,6 +12,8 @@ public class PlayerStatusUIManager : Singleton<PlayerStatusUIManager>
     public GameObject setting;
     [Header("교관")]
     public GameObject bag;
+    [Header("СѪÌõ")]
+    public GameObject smallHPBar;
 
     void Start()
     {