DESKTOP-FB72PO8\Administrator 1 روز پیش
والد
کامیت
0915693459
3فایلهای تغییر یافته به همراه20 افزوده شده و 17 حذف شده
  1. 10 10
      Assets/Res/UI/CombatPanel.prefab
  2. 1 1
      Assets/Scenes/testCombat.scene
  3. 9 6
      Assets/Scripts/GameLogic/Combat/Buff/BuffControl.cs

+ 10 - 10
Assets/Res/UI/CombatPanel.prefab

@@ -1221,9 +1221,9 @@ RectTransform:
   - {fileID: 5837590194851709526}
   m_Father: {fileID: 9037135992368401232}
   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: 138, y: 815}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 138, y: 3}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1343676762713764609
@@ -12632,9 +12632,9 @@ RectTransform:
   - {fileID: 8236420421261262979}
   m_Father: {fileID: 9037135992368401232}
   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: -278, y: -367}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -278, y: 445}
   m_SizeDelta: {x: 160, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4070201561065663842
@@ -13880,7 +13880,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.47}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: -0.3049996}
+  m_AnchoredPosition: {x: 0, y: -0.30499268}
   m_SizeDelta: {x: 40, y: 15.35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2505039596856159096
@@ -21134,9 +21134,9 @@ RectTransform:
   - {fileID: 1419724422312937674}
   m_Father: {fileID: 9037135992368401232}
   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_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 812}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6377944810843125593

+ 1 - 1
Assets/Scenes/testCombat.scene

@@ -2225,7 +2225,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 9 - 6
Assets/Scripts/GameLogic/Combat/Buff/BuffControl.cs

@@ -27,13 +27,16 @@ namespace GameLogic.Combat.Buff
                     return;
                 }
 
-                buffBasic.Init(_combatHeroEntity, source, buffInfo);
                 _allBuff.Add(buffBasic);
-                BuffEventData buffEventData = BuffEventData.Create();
-                buffEventData.BuffBasic = buffBasic;
-                buffEventData.source = source;
-                buffEventData.target = _combatHeroEntity;
-                CombatEventManager.Instance.Dispatch(CombatEventType.AddBuff, buffEventData);
+                buffBasic.Init(_combatHeroEntity, source, buffInfo);
+                if (buffBasic.buffInf != null)
+                {
+                    BuffEventData buffEventData = BuffEventData.Create();
+                    buffEventData.BuffBasic = buffBasic;
+                    buffEventData.source = source;
+                    buffEventData.target = _combatHeroEntity;
+                    CombatEventManager.Instance.Dispatch(CombatEventType.AddBuff, buffEventData);
+                }
             }
             else
             {