增加按键响应

修改弹幕提示内容

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

@@ -1,7 +1,6 @@
 using CommonAI.Zone;
 using CommonAI.ZoneClient;
 using CommonLang;
-using CommonLang.Geometry;
 using ET.Client;
 using ET.EventType;
 using ET.Server;
@@ -9,8 +8,8 @@ using Sirenix.Utilities;
 using System;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
 using UnityEngine;
+using UnityEngine.Windows;
 using XmdsCommon.Message;
 using XmdsCommon.Plugin;
 
@@ -63,21 +62,12 @@ namespace ET
 
         private void KeyboardCheckUpdate()
         {
-            if(Input.GetKeyDown(KeyCode.F1))
+            for(var i = KeyCode.F1; i < KeyCode.F13; i++)
             {
-                EventSystem.Instance.Publish(BattleFunc.Static.Clone(2));
-            }
-            else if(Input.GetKeyDown(KeyCode.F2))
-            {
-                EventSystem.Instance.Publish(BattleFunc.Static.Clone(4));
-            }
-            else if (Input.GetKeyDown(KeyCode.F3))
-            {
-                EventSystem.Instance.Publish(BattleFunc.Static.Clone(5));
-            }
-            else if (Input.GetKeyDown(KeyCode.F4))
-            {
-                EventSystem.Instance.Publish(BattleFunc.Static.Clone(3));
+                if(Input.GetKeyDown((KeyCode)i))
+                {
+                    EventSystem.Instance.Publish(BattleFunc.Static.Clone((int)i));
+                }
             }
         }
 
@@ -125,7 +115,6 @@ namespace ET
             Log.Debug($"OnLayerInit- scene template ID:{layer.Data.ID}");
         }
 
-        bool bFirstEnemy = true;
         //单位进入战斗  
         protected void LayerEvent_ObjectEnter(ZoneLayer layer, ZoneObject obj)
         {
@@ -153,13 +142,9 @@ namespace ET
                     }
 
                     //Log.Debug($"OnObjectEnter: {bu.ZUnit.TemplateID}@{obj.ObjectID}");
-                    if(bFirstEnemy && bu.ZUnit.Info.Properties is XmdsUnitProperties prop)
+                    if(bu.ZUnit.Info.Properties is XmdsUnitProperties prop && prop.GameStatusType == XmdsUnitProperties.StatusType.SpecialBoss)
                     {
-                        if (prop.GameStatusType == XmdsUnitProperties.StatusType.SpecialBoss)
-                        {
-                            bFirstEnemy = false;
-                            EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("发现怪兽来袭，宝宝们一起来守护家园吧！"));
-                        }
+                        EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone($"发现怪兽:'<font color=#fe3824>{prop.ServerData.BaseInfo.name}</font>'，你过来啊！"));
                     }
                 }
             }
@@ -214,6 +199,11 @@ namespace ET
                     {
                         EventSystem.Instance.Publish(PlayEffectEvent.Static.Clone(launcheffect, unit.Id, CommonLang.Geometry.Vector3.Zero));
                     }
+
+                    if (bunit.ZUnit.Info.Properties is XmdsUnitProperties prop)
+                    {
+                        EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone($"'<font color=#fe3824>{prop.ServerData.BaseInfo.name}</font>'受到了怪物的猛烈攻击"));
+                    }
                 }
             });
             eventHandler.AddListener<ShowTipsEventB2C>((ev) =>
@@ -254,13 +244,13 @@ namespace ET
 
                     if (bunit.ZUnit.Info.Properties is XmdsUnitProperties prop)
                     {
-                        if (prop.GameStatusType == XmdsUnitProperties.StatusType.SpecialBoss)
+                        if (prop.GameStatusType == XmdsUnitProperties.StatusType.SpecialElite)
                         {
-                            EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("花园宝宝因抵挡不住怪物致命一击，失去了所有能量"));
+                            EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone($"'<font color=#ff7d00>{prop.ServerData.BaseInfo.name}</font>'失去了所有能量"));
                         }
-                        else
+                        else if(prop.GameStatusType == XmdsUnitProperties.StatusType.SpecialBoss)
                         {
-                            EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("怪兽‘蝙蝠侠’，在众宝宝的合力攻击下，倒地不起"));
+                            EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone($"'<font color=#fe3824>{prop.ServerData.BaseInfo.name}</font>'，被打的倒地不起"));
                         }
                     }
                 }
@@ -336,6 +326,14 @@ namespace ET
                     vecTemp.Set(unit.ZoneObject.X, unit.ZoneObject.Y, unit.ZoneObject.Z);
                 }
                 EventSystem.Instance.Publish(PlayEffectEvent.Static.Clone(e.effect, e.ObjectID, vecTemp));
+
+                if(e.effect.Name == "chuanyunjian01")
+                {
+                    if (unit is BattleUnit bu && bu.ZUnit.Info.Properties is XmdsUnitProperties prop)
+                    {
+                        EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone($"'<font color=#fe3824>{prop.ServerData.BaseInfo.name}</font>'快要支撑不住了，宝宝们快来注入能量"));
+                    }
+                }
             });
             eventHandler.AddListener<XmdsUnitPropEventB2C>((ev) =>
             {

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

@@ -4,12 +4,25 @@ using ET.Client;
 using ET.EventType;
 using ET.Server;
 using System;
+using UnityEngine;
+using Random = System.Random;
+using Vector2 = CommonLang.Geometry.Vector2;
 
 namespace ET
 {
     [Event(SceneType.None)]
     public class BattleFuncHandler : BEvent<BattleFunc>
     {
+        private CommonLang.Geometry.Vector3 vecTmp = new CommonLang.Geometry.Vector3();
+        private LaunchEffect effectTmp = new()
+        {
+            Name = "Icon_tiantianquan",
+            BindBody = false,
+            ScaleToBodySize = 8,
+            EarthQuakeMS = 0,
+            EffectTimeMS = 9999999
+        };
+
         public override void OnEvent(BattleFunc a)
         {
             Log.Debug($"Battle Func:{a.FuncIndex}");
@@ -17,7 +30,7 @@ namespace ET
             var session = PlayerComponent.Instance.ClientScene().GetComponent<SessionComponent>().Session;
             switch (a.FuncIndex)
             {
-                case 2:
+                case (int)KeyCode.F1:
                     var units = new int[] { 101, 111, 121, 131 };
                     var centerpos = GetCurBattleCenter();
                     var rand = new Random();
@@ -38,24 +51,15 @@ namespace ET
                             Y = (int)y
                         }).Coroutine();
                     }
-                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("'宝宝一'进入了游戏，和大家一起守护家园！"));
-                    break;
-                case 3:
-                    session.Call(new C2G_TriggrBattleFunction()
-                    {
-                        TriggerID = 10111,
-                        Value1 = 0,
-                        Value2 = 0,
-                        Value3 = 0,
-                        Value4 = 0,
-                        Value5 = 0,
-                        Value6 = 0,
-                    }).Coroutine();
-                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("花园宝宝使用了道具‘电池’，释放出巨大能量"));
+                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("'<font color=#fe3824>宝宝x</font>'进入了游戏，和大家一起守护家园！"));
                     break;
-                case 4:
-                    var units2 = new int[] { 102, 112, 122, 132 };
+                case (int)KeyCode.F2:
                     centerpos = GetCurBattleCenter();
+
+                    vecTmp.Set(centerpos.X, centerpos.Y, 18);
+                    EventSystem.Instance.Publish(PlayEffectEvent.Static.Clone(effectTmp, 0, vecTmp, 1.57f));
+
+                    var units2 = new int[] { 102, 112, 122, 132 };
                     rand = new Random();
                     foreach (var id in units2)
                     {
@@ -73,11 +77,14 @@ namespace ET
                             Y = (int)y
                         }).Coroutine();
                     }
-                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("'宝宝一'使用了'甜甜圈道'成功变形为‘二级宝宝’"));
+                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("'<font color=#fe2c55>宝宝x</font>'使用了'<font color=#fe3824>甜甜圈</font>'，成功变形为'二级宝宝'"));
                     break;
-                case 5:
-                    var units3 = new int[] { 103, 113, 123, 133 };
+                case (int)KeyCode.F3:
                     centerpos = GetCurBattleCenter();
+                    vecTmp.Set(centerpos.X, centerpos.Y, 18);
+                    EventSystem.Instance.Publish(PlayEffectEvent.Static.Clone(effectTmp, 0, vecTmp, 1.57f));
+
+                    var units3 = new int[] { 103, 113, 123, 133 };
                     rand = new Random();
                     foreach (var id in units3)
                     {
@@ -95,7 +102,39 @@ namespace ET
                             Y = (int)y
                         }).Coroutine();
                     }
-                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("'宝宝二'使用了'魔棒'道具，成功变形为‘三级宝宝’"));
+                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("'<font color=#fe2c55>宝宝x</font>'使用了'<font color=#fe3824>甜甜圈</font>'，成功变形为'三级宝宝'"));
+                    break;
+                case (int)KeyCode.F4:
+                    session.Call(new C2G_TriggrBattleFunction()
+                    {
+                        TriggerID = 10111,
+                        Value1 = 0,
+                        Value2 = 0,
+                        Value3 = 0,
+                        Value4 = 0,
+                        Value5 = 0,
+                        Value6 = 0,
+                    }).Coroutine();
+                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("'<font color=#fe2c55>宝宝x</font>'使用了'<font color=#fe3824>能量电池</font>'，全员满血，并增加攻击"));
+                    break;
+                case (int)KeyCode.F5:
+                    session.Call(new C2G_TriggrBattleFunction()
+                    {
+                        TriggerID = 10111,
+                        Value1 = 0,
+                        Value2 = 0,
+                        Value3 = 0,
+                        Value4 = 0,
+                        Value5 = 0,
+                        Value6 = 0,
+                    }).Coroutine();
+                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("'<font color=#fe2c55>宝宝x</font>'使用了'<font color=#fe3824>恶魔炸弹</font>'，召唤出地狱火岩"));
+                    break;
+                case (int)KeyCode.F6:
+                case (int)KeyCode.F7:
+                case (int)KeyCode.F8:
+                case (int)KeyCode.F9:
+                case (int)KeyCode.F10:
                     break;
             }
         }

Unity/Assets/Scripts/Codes/Hotfix/Client/battle/unit/BattleUnit.cs

@@ -131,8 +131,6 @@ public class BattleUnit : BattleObject
         }
     }
 
-    bool bFirstShow1 = true;
-    bool bFirstShow2 = true;
     private void OnHPChanged()
     {
         if (ZUnit.Info.Properties is XmdsUnitProperties prop)
@@ -143,16 +141,7 @@ public class BattleUnit : BattleObject
                 var pg = (float)ZUnit.HP * 100 / ZUnit.MaxHP;
                 EventSystem.Instance.Publish<HPRefresh>(HPRefresh.Static.Clone(HPRefresh.Index.Tower, pg, hp));
                 //Log.Debug($"tower({ZUnit.ObjectID}@{ZUnit.Info.Name}) hp: {ZUnit.HP}/{ZUnit.MaxHP}");
-                if(bFirstShow1 && pg < 50)
-                {
-                    bFirstShow1 = false;
-                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("家园宝塔受到了怪物的猛烈攻击"));
-                }
-                else if(bFirstShow2 && pg < 10)
-                {
-                    bFirstShow2 |= false;
-                    EventSystem.Instance.Publish(BattleMsgEvent.Static.Clone("家园宝塔快要支撑不住了，宝宝们快来守护"));
-                }
+
             }
             else if (prop.GameStatusType == XmdsUnitProperties.StatusType.SpecialBoss)
             {

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

@@ -160,7 +160,7 @@ namespace ET.Client
             });
 
             btn1.visible = false;
-            btn2.visible = false;*/
+            btn2.visible = false;
             for (int i=1; i<= 99; i++)
             {
                 var btn = view.GetChild($"btn_func{i}");
@@ -188,7 +188,7 @@ namespace ET.Client
                 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;