[+] add basic enemy AI

[+] add BaseActor
[+] import plugin FloatBar
[+] import plugin FloatText

README.md

@@ -23,7 +23,7 @@
 2. [简单服务器][13]
 3. [基本位置同步][13]
 4. 不同步的检测与定位
-5. 逻辑的基本同步技能
+5. 逻辑的基本同步
 6. 碰撞检测库的使用
 7. 添加技能
 

Unity/Assets/LockstepEngine/Math/BaseType/LFloat.cs

@@ -217,20 +217,27 @@ public override string ToString(){
         #endregion
 
         #region override type convert 
+        public static implicit operator LFloat(short value){
+            return new LFloat(true,value * Precision);
+        }
 
-        public static explicit operator LFloat(int value){
+        public static explicit operator short(LFloat value){
+            return (short)(value._val / Precision);
+        }
+
+        public static implicit operator LFloat(int value){
             return new LFloat(true,value * Precision);
         }
 
-        public static explicit operator int(LFloat value){
+        public static implicit operator int(LFloat value){
             return value._val / Precision;
         }
 
         public static explicit operator LFloat(long value){
             return new LFloat(true,value * Precision);
         }
 
-        public static explicit operator long(LFloat value){
+        public static implicit operator long(LFloat value){
             return value._val / Precision;
         }
 

Unity/Assets/Scripts/Core/Base/BaseEntity.cs

@@ -15,11 +15,9 @@ public class BaseEntity : BaseLifeCycle, IEntity, ILPTriggerEventHandler {
         public CTransform2D transform = new CTransform2D();
 
         public int EntityId;
-        public int PrefabId;
         public object engineTransform;
         protected List<BaseComponent> allComponents = new List<BaseComponent>();
-        public LFloat speed = new LFloat(5);
-        public int currentHealth;
+        public int PrefabId;
 
         public BaseEntity(){
             Debug.Trace("BaseEntity  " + IdCounter.ToString(), true);

Unity/Assets/Scripts/Logic/Component/CMover.cs

@@ -4,7 +4,7 @@
 namespace LockstepTutorial {
     public partial class CMover : BasePlayerComponent {
         static LFloat _sqrStopDist = new LFloat(true, 40);
-        public LFloat speed => entity.speed;
+        public LFloat speed => player.moveSpd;
         public bool hasReachTarget = false;
         public bool needMove = true;
 
@@ -18,7 +18,7 @@ public override void DoUpdate(LFloat deltaTime){
                 var dir = input.inputUV.normalized;
                 transform.pos = transform.pos + dir * speed * deltaTime;
                 var targetDeg = dir.ToDeg();
-                transform.deg = CTransform2D.TurnToward(targetDeg, transform.deg, 360 * deltaTime, out var hasReachDeg);
+                transform.deg = CTransform2D.TurnToward(targetDeg, transform.deg, player.turnSpd * deltaTime, out var hasReachDeg);
             }
 
             hasReachTarget = !needChase;

Unity/Assets/Scripts/Logic/Entity/BaseActor.cs

@@ -0,0 +1,34 @@
+using System;
+using Lockstep.Logging;
+using Lockstep.Logic;
+using Lockstep.Math;
+
+namespace LockstepTutorial {
+    public partial class BaseActor : BaseEntity {
+        public IActorView actorView;
+        public LFloat moveSpd = 5;
+        public LFloat turnSpd = 360;
+        public int curHealth;
+        public int maxHealth = 100;
+        public bool isDead => curHealth <= 0;
+
+        public BaseActor(){
+            curHealth = maxHealth;
+        }
+
+        public virtual void TakeDamage(int amount, LVector3 hitPoint){
+            if (isDead) return;
+            curHealth -= amount;
+            actorView?.OnTakeDamage(amount, hitPoint);
+            OnTakeDamage(amount, hitPoint);
+            if (isDead) {
+                actorView?.OnDead();
+                OnDead();
+            }
+        }
+
+        protected virtual void OnTakeDamage(int amount, LVector3 hitPoint){}
+
+        protected virtual void OnDead(){}
+    }
+}

Unity/Assets/Scripts/Logic/Entity/Enemy.cs

@@ -1,11 +1,72 @@
 using Lockstep.Collision2D;
 using Lockstep.Logic;
 using Lockstep.Math;
+using UnityEngine;
 using Debug = Lockstep.Logging.Debug;
 
 namespace LockstepTutorial {
-    public class Enemy : BaseEntity {
-        public IEnemyView eventHandler;
-        public BaseEntity target;
+    public class Enemy : BaseActor {
+        public BaseActor target;
+
+        public LFloat stopDistSqr = 1 * 1;
+        public LFloat atkInterval = 1;
+        private LFloat atkTimer;
+        public int damage = 10;
+
+        public Enemy(){
+            moveSpd = 2;
+            turnSpd = 150;
+        }
+
+        public override void DoUpdate(LFloat deltaTime){
+            //find target
+            var allPlayer = GameManager.allPlayers;
+            var minDist = LFloat.MaxValue;
+            BaseActor minTarget = null;
+            foreach (var player in allPlayer) {
+                if(player.isDead) continue;
+                var dist = (player.transform.pos - transform.pos).sqrMagnitude;
+                if (dist < minDist) {
+                    minTarget = player;
+                    minDist = dist;
+                }
+            }
+
+            target = minTarget;
+            if (minTarget == null)
+                return;
+            if (minDist > stopDistSqr) {
+                // turn to target
+                var targetPos = minTarget.transform.pos;
+                var currentPos = transform.pos;
+                var diff = targetPos - currentPos;
+                var dir = diff.normalized;
+                var turnVal = turnSpd * deltaTime;
+                var targetDeg = CTransform2D.TurnToward(targetPos, currentPos, transform.deg, turnVal,
+                    out var isFinishedTurn);
+                transform.deg = targetDeg;
+                //move to target
+                var distToTarget = (targetPos - currentPos).magnitude;
+                var movingStep = moveSpd * deltaTime;
+                if (movingStep > distToTarget) {
+                    movingStep = distToTarget;
+                }
+
+                var toTarget = (targetPos - currentPos).normalized;
+                transform.pos = transform.pos + toTarget * movingStep;
+            }
+            else {
+                //atk target
+                atkTimer -= deltaTime;
+                if (atkTimer <= 0) {
+                    atkTimer = atkInterval;
+                    //Atk
+                    target.TakeDamage(damage, target.transform.Pos3);
+                }
+            }
+        }
+        protected override void OnDead(){
+            EnemyManager.Instance.RemoveEnemy(this);
+        }
     }
 }

Unity/Assets/Scripts/Logic/Entity/Player.cs

@@ -5,8 +5,7 @@
 using UnityEngine.SceneManagement;
 
 namespace LockstepTutorial {
-    public partial class Player : BaseEntity {
-        public IPlayerView eventHandler;
+    public partial class Player : BaseActor {
         public PlayerInput InputAgent = new PlayerInput();
         public CMover CMover = new CMover();
         public int localId;

Unity/Assets/Scripts/Logic/Interfaces/IActorView.cs

@@ -0,0 +1,9 @@
+using Lockstep.Logic;
+using Lockstep.Math;
+
+namespace LockstepTutorial {
+    public interface IActorView : IView {
+        void OnTakeDamage(int amount, LVector3 hitPoint);
+        void OnDead();
+    }
+}

Unity/Assets/Scripts/Logic/Interfaces/IEnemyView.cs

@@ -2,6 +2,6 @@
 using Lockstep.Math;
 
 namespace LockstepTutorial {
-    public interface IEnemyView : IView {
+    public interface IEnemyView : IActorView {
     }
 }

Unity/Assets/Scripts/Logic/Interfaces/IPlayerView.cs

@@ -2,9 +2,6 @@
 using Lockstep.Math;
 
 namespace LockstepTutorial {
-    public interface IPlayerView :IView {
-        void TakeDamage(int amount, LVector3 hitPoint);
-        void OnDead();
-        void Animating(bool isIdle);
+    public interface IPlayerView : IActorView  {
     }
 }

Unity/Assets/Scripts/Logic/Managers/GameManager.cs

@@ -68,7 +68,8 @@ private void Awake(){
             Screen.SetResolution(1024, 768, false);
             gameObject.AddComponent<PingMono>();
             gameObject.AddComponent<InputMono>();
-
+
+            Lockstep.Logging.Logger.OnMessage += UnityLogHandler.OnLog;
             _Awake();
         }
 
@@ -315,12 +316,12 @@ public int GetHash(){
             int hash = 1;
             int idx = 0;
             foreach (var entity in allPlayers) {
-                hash += entity.currentHealth.GetHash() * PrimerLUT.GetPrimer(idx++);
+                hash += entity.curHealth.GetHash() * PrimerLUT.GetPrimer(idx++);
                 hash += entity.transform.GetHash() * PrimerLUT.GetPrimer(idx++);
             }
 
             foreach (var entity in EnemyManager.Instance.allEnemy) {
-                hash += entity.currentHealth.GetHash() * PrimerLUT.GetPrimer(idx++);
+                hash += entity.curHealth.GetHash() * PrimerLUT.GetPrimer(idx++);
                 hash += entity.transform.GetHash() * PrimerLUT.GetPrimer(idx++);
             }
 

Unity/Assets/Scripts/Logic/Service/UnityEntityService.cs

@@ -15,6 +15,7 @@ public static GameObject CreateEntity(BaseEntity entity, int prefabId, LVector3
             foreach (var view in views) {
                 view.BindEntity(entity);
             }
+
             entity.PrefabId = prefabId;
             entity.DoAwake();
             entity.DoStart();

Unity/Assets/Scripts/Logic/Util/UnityLogHandler.cs

@@ -0,0 +1,23 @@
+
+using Lockstep.Logging;
+
+namespace Lockstep.Game {
+    public class UnityLogHandler {
+        public static void OnLog(object sender, LogEventArgs args){
+            switch (args.LogSeverity) {
+                case LogSeverity.Info:
+                    UnityEngine.Debug.Log(args.Message);
+                    break;
+                case LogSeverity.Warn:
+                    UnityEngine.Debug.LogWarning(args.Message);
+                    break;
+                case LogSeverity.Error:
+                    UnityEngine.Debug.LogError(args.Message);
+                    break;
+                case LogSeverity.Exception:
+                    UnityEngine.Debug.LogError(args.Message);
+                    break;
+            }
+        }
+    }
+}

Unity/Assets/Scripts/View/EntityView/BaseActorView.cs

@@ -0,0 +1,36 @@
+using Lockstep.Logic;
+using Lockstep.Math;
+using UnityEngine;
+
+namespace LockstepTutorial {
+    public abstract class BaseActorView : MonoBehaviour, IActorView {
+        public UIFloatBar uiFloatBar;
+        public BaseActor baseActor;
+        protected bool isDead => baseActor?.isDead ?? true;
+
+        public virtual void BindEntity(BaseEntity entity){
+            baseActor = entity as BaseActor;
+            baseActor.actorView = this;
+            uiFloatBar = FloatBarManager.CreateFloatBar(transform, baseActor.curHealth, baseActor.maxHealth);
+            transform.position = baseActor.transform.Pos3.ToVector3();
+        }
+
+        public virtual void OnTakeDamage(int amount, LVector3 hitPoint){
+            uiFloatBar.UpdateHp(baseActor.curHealth, baseActor.maxHealth);
+            FloatTextManager.CreateFloatText(hitPoint.ToVector3(), -amount);
+        }
+
+        public virtual void OnDead(){
+            if (uiFloatBar != null) FloatBarManager.DestroyText(uiFloatBar);
+            GameObject.Destroy(gameObject);
+        }
+
+        private void Update(){
+            var pos = baseActor.transform.Pos3.ToVector3();
+            transform.position = Vector3.Lerp(transform.position, pos, 0.3f);
+            var deg = baseActor.transform.deg.ToFloat();
+            //deg = Mathf.Lerp(transform.rotation.eulerAngles.y, deg, 0.3f);
+            transform.rotation = Quaternion.Lerp(transform.rotation, Quaternion.Euler(0, deg, 0), 0.3f);
+        }
+    }
+}

Unity/Assets/Scripts/View/EntityView/EnemyView.cs

@@ -0,0 +1,9 @@
+using System.Collections;
+using Lockstep.Logic;
+using Lockstep.Math;
+using UnityEngine;
+
+namespace LockstepTutorial {
+    public class EnemyView : BaseActorView, IEnemyView {
+    }
+}