修改bug

Assets/Res/UI/CombatPanel.prefab

@@ -430,6 +430,7 @@ RectTransform:
   - {fileID: 7561374860469839472}
   - {fileID: 271634867267467130}
   - {fileID: 6966436685152839904}
+  - {fileID: 345731962149340685}
   m_Father: {fileID: 1811249814091911294}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -465,6 +466,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: feng
+    gameObject: {fileID: 4209073936425644878}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &6539911976127367467
 MonoBehaviour:
@@ -3317,6 +3323,94 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &3590735151673375621
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7255814566391051554}
+  - component: {fileID: 3368965865282280724}
+  - component: {fileID: 3958097333011706263}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: feng
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7255814566391051554
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3590735151673375621}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2.4990404, y: 2.4990404, z: 0.9996162}
+  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: 70, y: 63}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3368965865282280724
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3590735151673375621}
+  m_CullTransparentMesh: 1
+--- !u!114 &3958097333011706263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3590735151673375621}
+  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: 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: 0
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xx
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: d6f50d2b7b6e4b0b7542e03171e0215b
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3739599620287345921
 GameObject:
   m_ObjectHideFlags: 0
@@ -3907,6 +4001,94 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &4209073936425644878
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 345731962149340685}
+  - component: {fileID: 3523044967737643242}
+  - component: {fileID: 1430746582081154423}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: feng
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &345731962149340685
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4209073936425644878}
+  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: 70, y: 63}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3523044967737643242
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4209073936425644878}
+  m_CullTransparentMesh: 1
+--- !u!114 &1430746582081154423
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4209073936425644878}
+  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: 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: 0
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xx
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: d6f50d2b7b6e4b0b7542e03171e0215b
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4295364262558550610
 GameObject:
   m_ObjectHideFlags: 0
@@ -5484,6 +5666,7 @@ RectTransform:
   - {fileID: 7479615743388508295}
   - {fileID: 7833523249163798776}
   - {fileID: 2146270928697371138}
+  - {fileID: 7255814566391051554}
   m_Father: {fileID: 866017355225982164}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -5519,6 +5702,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: feng
+    gameObject: {fileID: 3590735151673375621}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &2400465450944708116
 MonoBehaviour:

Assets/Scenes/testCombat.scene

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

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

@@ -1,5 +1,7 @@
+using Common.Utility.CombatEvent;
 using Core.Language;
 using Excel2Json;
+using Fort23.Core;
 using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
@@ -18,11 +20,40 @@ namespace Fort23.Mono
         public override void AddEvent()
         {
             StaticUpdater.Instance.AddLateUpdateCallBack(Update);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.RemoveBuff, RemoveBuff);
         }
 
+
         public override void DelEvent()
         {
             StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.RemoveBuff, RemoveBuff);
+        }
+
+        private void AddBuff(IEventData iEventData)
+        {
+            BuffEventData buffEventData = iEventData as BuffEventData;
+            if (buffEventData.target == combatMagicWeaponEntity)
+            {
+                if (buffEventData.BuffBasic is b_1008)
+                {
+                    feng.SetActive(true);
+                }
+            }
+        }
+
+        private void RemoveBuff(IEventData iEventData)
+        {
+            BuffEventData buffEventData = iEventData as BuffEventData;
+            if (buffEventData.target == combatMagicWeaponEntity)
+            {
+                if (buffEventData.BuffBasic is b_1008)
+                {
+                    feng.SetActive(false);
+                }
+            }
         }
 
         public override void AddButtonEvent()
@@ -57,8 +88,8 @@ namespace Fort23.Mono
 
         public void InitWidget(CombatMagicWeaponEntity combatMagicWeaponEntity)
         {
+            feng.SetActive(false);
             this.combatMagicWeaponEntity = combatMagicWeaponEntity;
-            
         }
 
         private void Update()
@@ -68,7 +99,9 @@ namespace Fort23.Mono
                 return;
             }
 
-            float d = (combatMagicWeaponEntity.cd+combatMagicWeaponEntity.RootMagicWeaponControl.globalMagicWeaponCd) / (combatMagicWeaponEntity.MaxCd);
+            float d =
+                (combatMagicWeaponEntity.cd + combatMagicWeaponEntity.RootMagicWeaponControl.globalMagicWeaponCd) /
+                (combatMagicWeaponEntity.MaxCd);
             cd.fillAmount = 1 - d;
         }
     }

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

@@ -41,6 +41,17 @@ namespace Fort23.Mono
 	      return _myButton;
 	     }
 	   }
+	  private GameObject _feng;
+	  public GameObject feng
+	   {
+	   get{
+	      if (_feng == null)
+	       {
+	         _feng  = GetUIUnit<GameObject>("feng"); 
+	       }
+	      return _feng;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

UserSettings/Layouts/default-2022.dwlt

@@ -43,8 +43,8 @@ MonoBehaviour:
     y: 786
     width: 897
     height: 513
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -101,7 +101,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 150}
   m_MaxSize: {x: 8096, y: 24288}
   vertical: 1
-  controlID: 43
+  controlID: 70
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -153,7 +153,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 169
+  controlID: 174
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -257,7 +257,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 150}
   m_MaxSize: {x: 32384, y: 24288}
   vertical: 0
-  controlID: 230
+  controlID: 409
   draggingID: 0
 --- !u!114 &11
 MonoBehaviour:
@@ -325,8 +325,8 @@ MonoBehaviour:
     y: 0
     width: 648
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -870,9 +870,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 1652f1ff4498f1ffa6b9f3ffacb9f3ff8ceff3ff70dbf4ffd0dbf4ffd6dbf4ff98dcf4fffadcf4ffeeecf4fff4ecf4ffe6edf4fff4edf4ffaae5f5ffb0e5f5ffbaf2f5ff5ef6f5ff1c36f7ff3efdf7ff44fdf7ffc2d6f9ffd2d6f9ff320ffaffbc11faffd467fcffdc7bfcffe47bfcff0e7cfcff607cfcff747cfcff787cfcff7c7cfcff807cfcff8a7cfcffd2fffcff0000fdff9a04fdff1a07fdffee12fdfff412fdffda13fdffe813fdff7e3efefffe40feff06c6feff14c6feff50c7ffff20c8ffff78faffff
+      m_SelectedIDs: 16eeffff
+      m_LastClickedID: -4586
+      m_ExpandedIDs: 9028fcff9628fcff5829fcffba29fcff8839fcff8e39fcffa43afcffb23afcffec6ffeff7a7bfeffa87bfeff407cfeff027dfeff647dfeff468dfeff4c8dfeff628efeff708efeffaeaafeffb2aafeffc0aafeffc4aafeff5cabfeff1eacfeff80acfeff58bcfeff5ebcfeff74bdfeff82bdfeff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -988,7 +988,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/VFX
+    - Assets/Scripts/GameUI/UI/ShopPanel
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -996,30 +996,30 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/VFX
+  - Assets/Scripts/GameUI/UI/ShopPanel
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 3ce90000
-    m_LastClickedID: 59708
-    m_ExpandedIDs: 0000000016e9000018e900001ae900001ce900001ee9000020e9000022e9000024e9000026e9000028e900002ae900002ce900002ee9000030e9000032e9000034e9000036e9000038e900003ae900003ee9000040e900006aec000006ed000090ed0000cc96020000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 1606}
+    m_SelectedIDs: c8ed0000
+    m_LastClickedID: 60872
+    m_ExpandedIDs: 0000000074e9000076e9000078e900007ae900007ce900007ee9000080e9000082e9000084e9000086e9000088e900008ae900008ce900008ee9000090e9000092e9000094e9000096e9000098e900009ae900009ce90000a0e90000a2e90000a4e900001ced000020ed000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: ArtHero
-      m_OriginalName: ArtHero
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 59698
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 5}
     m_SearchString: 
@@ -1033,7 +1033,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000016e9000018e900001ae900001ce900001ee9000020e9000022e9000024e9000026e9000028e900002ae900002ce900002ee9000030e9000032e9000034e9000036e9000038e900003ae900003ce900003ee9000040e90000
+    m_ExpandedIDs: 0000000074e9000076e9000078e900007ae900007ce900007ee9000080e9000082e9000084e9000086e9000088e900008ae900008ce900008ee9000090e9000092e9000094e9000096e9000098e900009ae900009ce900009ee90000a0e90000a2e90000a4e90000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1064,18 +1064,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b4020100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Boss01
-      m_OriginalName: Boss01
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 145446
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 5}
     m_CreateAssetUtility:
@@ -1595,9 +1595,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 9.377306, y: 10.118164, z: 32.01944}
+    m_Target: {x: -0.030714257, y: -2.433876, z: 0.1784079}
     speed: 2
-    m_Value: {x: 9.377306, y: 10.118164, z: 32.01944}
+    m_Value: {x: -0.030714257, y: -2.433876, z: 0.1784079}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1643,13 +1643,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.3667693, y: 0.17591433, z: -0.070912376, w: 0.9108758}
+    m_Target: {x: -0.029683987, y: -0.01918274, z: -0.0006357493, w: 0.9994693}
     speed: 2
-    m_Value: {x: 0.36673468, y: 0.17589773, z: -0.07090568, w: 0.9107898}
+    m_Value: {x: -0.02968119, y: -0.019180933, z: -0.0006356895, w: 0.99937516}
   m_Size:
-    m_Target: 22.645935
+    m_Target: 0.8925555
     speed: 2
-    m_Value: 22.645935
+    m_Value: 0.8925555
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1669,7 +1669,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.21744439, y: 0.11709682, z: -0.02636934, w: 0.9687568}
+  m_LastSceneViewRotation: {x: -0.029683987, y: -0.01918274, z: -0.0006357493, w: 0.9994693}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: