增加血条显隐和静音按键

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/BattleMgr_Cmd.cs

@@ -128,6 +128,10 @@ namespace ET
                     }).Coroutine();
                     break;
                 case (int)KeyCode.F10:
+                    EventSystem.Instance.Publish<ShowOrHideHeadBar>();
+                    break;
+                case (int)KeyCode.F11:
+                    EventSystem.Instance.Publish<SoundMuteEvent>();
                     break;
             }
             await ETTask.CompletedTask;

Unity/Assets/Scripts/Codes/HotfixView/Client/UI/HUD/CreateHUD.cs

@@ -4,12 +4,25 @@ using FairyGUI;
 namespace ET.Client
 {
     [Event]
-    public class SceneChangeFinishEvent_CreateUIHelp : BEvent<ShowHUDEvent>
+    public class ShowHUDEventHandler : BEvent<ShowHUDEvent>
     {
         protected override async ETTask OnEvent(ShowHUDEvent _)
         {
             var view = await UIHelper.Create( "HUD" );
-            HUDMgr.InitView( view );
+
+            var progress1 = view.GetChild("HPBar1") as GProgressBar;
+            var progress2 = view.GetChild("HPBar2") as GProgressBar;
+            progress1.visible = progress2.visible = false;
+            var txthp1 = progress1.GetChild("title");
+            txthp1.text = "";
+            var txthp2 = progress2.GetChild("title");
+            txthp2.text = "";
+
+            var btn = view.GetChild("btn_start");
+            btn.onClick.Set(() => {
+                btn.visible = false;
+                EventSystem.Instance.Publish(BattleFunc.Static.Clone((int)BattleFunc.FUNC.Start));
+            });
         }
     }
 
@@ -156,78 +169,41 @@ namespace ET.Client
             await ETTask.CompletedTask;
         }
     }
-    
 
-    public static class HUDMgr
+    [Event]
+    public class ShowOrHideHeadBarHandler : BEvent<ShowOrHideHeadBar>
     {
-        public static void InitView(GComponent view)
+        protected override async ETTask OnEvent(ShowOrHideHeadBar a)
         {
-            /*var btn1 = view.GetChild("btn_skill1");
-            var btn2 = view.GetChild("btn_skill2");
-
-            var actor = UnitMgr.Instance.Actor;
-            if (actor == null || !actor.IsSkillOk)
+            if(a != null)
             {
-                btn1.visible = false;
-                btn2.visible = false;
-                return;
+                GlobalViewMgr.Instance.HeadbarView.visible = a.Flag;
             }
-            btn1.visible = actor.GetSkill(0) != null;
-            btn2.visible = actor.GetSkill(1) != null;
-
-            var img = view.GetChild("img_direction");
-            btn1.onClick.Set(() => {
-                EventSystem.Instance.Publish<LaunchSkillEvent>(LaunchSkillEvent.Static.Clone(0)) ;
-            });
-
-            btn2.onClick.Set(() => {
-                EventSystem.Instance.Publish<LaunchSkillEvent>(LaunchSkillEvent.Static.Clone(1));
-            });
-
-            btn1.visible = false;
-            btn2.visible = false;
-            for (int i=1; i<= 99; i++)
+            else
             {
-                var btn = view.GetChild($"btn_func{i}");
-                if (btn == null) break;
-
-                var index = i;
-                btn.onClick.Set(() =>
-                {
-                    if(index == 1)
-                    {
-                        GlobalViewMgr.Instance.HeadbarView.visible = !GlobalViewComponent.Instance.HeadbarView.visible;
-                        return;
-                    }
-                    EventSystem.Instance.Publish<BattleFunc>(BattleFunc.Static.Clone(index));
-                });
+                GlobalViewMgr.Instance.HeadbarView.visible = !GlobalViewMgr.Instance.HeadbarView.visible;
             }
-
+            await ETTask.CompletedTask;
+        }
+    }
+    [Event]
+    public class SoundMuteEventHandler : BEvent<SoundMuteEvent>
+    {
+        protected override async ETTask OnEvent(SoundMuteEvent a)
+        {
             bool isMute = SoundManager.Instance.UnityAudioSource.mute;
-            var btnmute = view.GetChild("btn_mute");
-            var gou = (btnmute as GComponent).GetChild("checked");
-            gou.visible = isMute;
-            btnmute.onClick.Set(() =>
+            if (a != null)
+            {
+                isMute = a.Flag;
+            }
+            else
             {
                 isMute = !isMute;
-                gou.visible = isMute;
-                SoundManager.Instance.UnityAudioSource.mute = isMute;
-                GameSetting.Instance.SetBool(GameSetting.Sets.Mute_int, isMute);
-            });*/
-
-            var progress1 = view.GetChild("HPBar1") as GProgressBar;
-            var progress2 = view.GetChild("HPBar2") as GProgressBar;
-            progress1.visible = progress2.visible = false;
-            var txthp1 = progress1.GetChild("title");
-            txthp1.text = "";
-            var txthp2 = progress2.GetChild("title");
-            txthp2.text = "";
-
-            var btn = view.GetChild("btn_start");
-            btn.onClick.Set( () => {
-                btn.visible = false;
-                EventSystem.Instance.Publish(BattleFunc.Static.Clone((int)BattleFunc.FUNC.Start));
-            });
+            }
+            SoundManager.Instance.UnityAudioSource.mute = isMute;
+            GameSetting.Instance.SetBool(GameSetting.Sets.Mute_int, isMute);
+            await ETTask.CompletedTask;
         }
     }
+
 }

Unity/Assets/Scripts/Codes/Model/Client/EventTypeClient.cs

@@ -120,13 +120,25 @@ namespace ET
             public float RotationX;
 
             public static SyncUnitPosEvent Static = new SyncUnitPosEvent();
-            public SyncUnitPosEvent Clone(uint id, CommonLang.Geometry.Vector3 v, float r, float rx = 0f)
+            public static SyncUnitPosEvent Clone(uint id, CommonLang.Geometry.Vector3 v, float r, float rx = 0f)
             {
-                Id = id;
-                Pos.Set(v);
-                Rotation = r;
-                RotationX = rx;
-                return this;
+                Static.Id = id;
+                Static.Pos.Set(v);
+                Static.Rotation = r;
+                Static.RotationX = rx;
+                return Static;
+            }
+        }
+        public class SyncUnitHpEvent
+        {
+            public uint Id;
+            public float Value;
+            public static SyncUnitHpEvent Static = new SyncUnitHpEvent();
+            public static SyncUnitHpEvent Clone(uint id, float v)
+            {
+                Static.Id = id;
+                Static.Value = v;
+                return Static;
             }
         }
         public class PlayEffectEvent
@@ -280,5 +292,25 @@ namespace ET
                 return Static;
             }
         }
+        public class ShowOrHideHeadBar
+        {
+            public bool Flag;
+            public static ShowOrHideHeadBar Static = new();
+            public static ShowOrHideHeadBar Clone(bool flag)
+            {
+                Static.Flag = flag;
+                return Static;
+            }
+        }
+        public class SoundMuteEvent
+        {
+            public bool Flag;
+            public static SoundMuteEvent Static = new();
+            public static SoundMuteEvent Clone(bool flag)
+            {
+                Static.Flag = flag;
+                return Static;
+            }
+        }
     }
 }