提交Unity 联机Pro

JNFrame2/Assets/Scripts/Game/Data.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 659ee015a1d7417d820cb34271c8c8ba
+timeCreated: 1721188292

JNFrame2/Assets/Scripts/Game/Data/DStateBasisData.cs

@@ -0,0 +1,35 @@
+using System;
+using JNGame.Math;
+using UnityEngine;
+
+namespace Game.JNGState.Logic.Data
+{
+    [Serializable]
+    public class DValuePosition
+    {
+        public long x;
+        public long y;
+        public long z;
+
+        public Vector3 ToVector3()
+        {
+            return new Vector3()
+            {
+                x = new LFloat(true,x).ToFloat(),
+                y = new LFloat(true,y).ToFloat(),
+                z = new LFloat(true,z).ToFloat(),
+            };
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is not DValuePosition old) return false;
+            return old.x == x && old.y == y && old.z == z;
+        }
+
+        public LVector3 ToLVector3()
+        {
+            return new LVector3(new LFloat(true,x), new LFloat(true,y), new LFloat(true,z));
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/Data/DStateBasisData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e710dfde494c4e8eb582ad2c45b3c12a
+timeCreated: 1722822666

JNFrame2/Assets/Scripts/Game/Data/DStateDataSystem.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using AppGame;
+using Google.Protobuf;
+using JNGame.Sync.Entity;
+using JNGame.Sync.State.Tile.Entity;
+using JNGame.Sync.System.Data;
+using Plugins.JNGame.Network.Action;
+
+namespace Game.JNGState.Logic.Data
+{
+    public abstract class DStateDataSystem<T,E> : STileDataSystem<T,E> where T : ISTileData,new() where E : JNTileEntity, new()
+    {
+        protected DStateDataSystem(SStateDataEnum type) : base(type)
+        {
+        }
+        
+        public override void OnSendUBytes(Dictionary<long, byte[]> bytes)
+        {
+
+            JNStateItemData data = new JNStateItemData();
+            data.NetID = NetID;
+            
+            foreach (var byteItem in bytes)
+            {
+                data.Messages.Add(byteItem.Key,new JNStateData()
+                {
+                    Data = ByteString.CopyFrom(byteItem.Value)
+                });
+            }
+            
+            App.Server.AllSend((int)NActionEnum.NSyncStateDataUpdate,data);
+            
+        }
+
+    }
+}

JNFrame2/Assets/Scripts/Game/Data/DStateDataSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: aadb74e9a104400fa1b865990faf8315
+timeCreated: 1721997279

JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DotRecast.Core.Collections;
+using Entitas;
+using Game.JNGFrame.Logic.Entity;
+using Game.JNGFrame.Logic.Entity.Contexts;
+using JNGame.Math;
+using JNGame.Sync.State.Tile.Entity;
+using JNGame.Sync.System;
+using JNGame.Sync.System.Data;
+using Newtonsoft.Json;
+using UnityEngine;
+
+namespace Game.JNGState.Logic.Data
+{
+    
+    [Serializable]
+    public class EDNodeValue
+    {
+        public DValuePosition Position = null;
+    }
+    
+    public class EDNodeData : ISTileData
+    {
+
+        public readonly EDNodeValue Value = new ();
+
+        private readonly EDNode _data;
+        public override bool IsHost => _data is not null && _data.IsHost;
+
+        public EDNodeData()
+        {
+        }
+
+        public EDNodeData(EDNode node){
+            Id = node.Id;
+            Value.Position = new DValuePosition()
+            {
+                x = node.Position.x.rawValue,
+                y = node.Position.y.rawValue,
+                z = node.Position.z.rawValue,
+            };
+            _data = node;
+        }
+
+        public override bool IsEquals(ISData data)
+        {
+            var node = data as EDNodeData;
+            if (node is null) return false;
+            return Value.Position.Equals(node.Value.Position);
+        }
+
+        public override byte[] GetByte()
+        {
+            return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(Value));
+        }
+
+        public override byte[] GetByteDifference(ISData diffValue = null)
+        {
+            var diff = diffValue as EDNodeData;
+            if (diff is null || IsEquals(diffValue)) return Array.Empty<byte>();
+            
+            var value = new EDNodeValue();
+
+            if (diff.Value.Position is not null) value.Position = diff.Value.Position;
+            
+            return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(value));
+        }
+
+        /// <summary>
+        /// 生效字节
+        /// </summary>
+        /// <param name="bytes"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        public override void UByte(byte[] bytes)
+        {
+            if (bytes.Length == 0) return;
+            var value = JsonConvert.DeserializeObject<EDNodeValue>(Encoding.UTF8.GetString(bytes));
+            if (value.Position is not null) Value.Position = value.Position;
+
+        }
+    }
+    public class EDNodeDataSystem : DStateDataSystem<EDNodeData,EDNode>
+    {
+
+        public EDNodeDataSystem(SStateDataEnum type) : base(type)
+        {
+        }
+
+        public override JNTileContext<EDNode> NodeContext => Contexts.GetContext<EDNodeContext>();
+
+        public override int NetID => (int)NetDataEnum.EDNodeData;
+
+        public override Dictionary<long, EDNodeData> GetLatest()
+        {
+            var nodes = new Dictionary<long, EDNodeData>();
+            NodeContext.GetEntities().ForEach(child =>
+            {
+                nodes.Add(child.Id,new EDNodeData(child));
+            });
+            return nodes;
+        }
+        
+    }
+    
+}

JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0f1c12a776364a24a4e8d1b1372bed25
+timeCreated: 1721101714

JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DotRecast.Core.Collections;
+using Entitas;
+using Game.JNGFrame.Logic.Entity;
+using Game.JNGFrame.Logic.Entity.Contexts;
+using JNGame.Math;
+using JNGame.Sync.State.Tile.Entity;
+using JNGame.Sync.System;
+using JNGame.Sync.System.Data;
+using Newtonsoft.Json;
+using UnityEngine;
+
+namespace Game.JNGState.Logic.Data
+{
+
+    [Serializable]
+    public class EDPlayerValue
+    {
+        public int? Auth = null;
+        public DValuePosition Position = null;
+    }
+    
+    public class EDPlayerData : ISTileData
+    {
+
+        public readonly EDPlayerValue Value = new ();
+        private readonly EDPlayer _data;
+        public override bool IsHost => _data is not null && _data.IsHost;
+
+        public EDPlayerData()
+        {
+        }
+
+        public EDPlayerData(EDPlayer node){
+            Id = node.Id;
+            Value.Auth = node.Controller.Auth;
+            Value.Position = new DValuePosition()
+            {
+                x = node.Position.x.rawValue,
+                y = node.Position.y.rawValue,
+                z = node.Position.z.rawValue,
+            };
+            _data = node;
+        }
+
+        public override bool IsEquals(ISData data)
+        {
+            var node = data as EDPlayerData;
+            if (node is null) return false;
+            return Value.Position.Equals(node.Value.Position)
+                && Value.Auth.Equals(node.Value.Auth);
+        }
+
+        public override byte[] GetByte()
+        {
+            return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(Value));
+        }
+
+        public override byte[] GetByteDifference(ISData diffValue = null)
+        {
+            var diff = diffValue as EDPlayerData;
+            if (diff is null || IsEquals(diffValue)) return Array.Empty<byte>();
+            
+            var value = new EDPlayerValue();
+
+            if (diff.Value.Position is not null) value.Position = diff.Value.Position;
+            if (diff.Value.Auth is not null) value.Auth = diff.Value.Auth;
+            
+            return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(value));
+        }
+
+        /// <summary>
+        /// 生效字节
+        /// </summary>
+        /// <param name="bytes"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        public override void UByte(byte[] bytes)
+        {
+            
+            if (bytes.Length == 0) return;
+            var value = JsonConvert.DeserializeObject<EDPlayerValue>(Encoding.UTF8.GetString(bytes));
+            if (value.Position is not null) Value.Position = value.Position;
+            if (value.Auth is not null) Value.Auth = value.Auth;
+
+        }
+    }
+    public class EDPlayerDataSystem : DStateDataSystem<EDPlayerData,EDPlayer>
+    {
+
+        public EDPlayerDataSystem(SStateDataEnum type) : base(type)
+        {
+        }
+        
+        public override int NetID => (int)NetDataEnum.EDPlayerData;
+        
+        public override JNTileContext<EDPlayer> NodeContext => Contexts.GetContext<EDPlayerContext>();
+
+
+        public override Dictionary<long, EDPlayerData> GetLatest()
+        {
+            var nodes = new Dictionary<long, EDPlayerData>();
+            NodeContext.GetEntities().ForEach(child =>
+            {
+                nodes.Add(child.Id,new EDPlayerData(child));
+            });
+            return nodes;
+        }
+
+    }
+    
+}

JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f7aabf53b2ce4c838b5a5812493a625c
+timeCreated: 1722256803

JNFrame2/Assets/Scripts/Game/Data/NetDataEnum.cs

@@ -0,0 +1,8 @@
+namespace Game.JNGState.Logic.Data
+{
+    public enum NetDataEnum : int
+    {
+        EDNodeData = 0,
+        EDPlayerData = 1,
+    }
+}

JNFrame2/Assets/Scripts/Game/Data/NetDataEnum.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2e77dac300e7430c8ceebaf85db683c4
+timeCreated: 1721959245

JNFrame2/Assets/Scripts/Game/Input.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e904e6b6d5f5480f8a1bd0c31efb43c7
+timeCreated: 1721635877

JNFrame2/Assets/Scripts/Game/Input/DInputSystem.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using JNGame.Sync.System.View;
+using JNGame.Util.Types;
+
+namespace Game.Input
+{
+    public class DInputSystem : JNInputSystem
+    {
+        
+        private KeyValue<Type, int> _tClass = new KeyValue<Type, int>();
+        protected override KeyValue<Type, int> TClass => _tClass;
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _tClass.Add(typeof(IDWorld),0);
+            _tClass.Add(typeof(IDPlayer),1);
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/Input/DInputSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ff9df2dda66b4661b9c1459e93f9c56c
+timeCreated: 1721638606

JNFrame2/Assets/Scripts/Game/Input/IDPlayer.cs

@@ -0,0 +1,34 @@
+using System;
+using JNGame.Math;
+using JNGame.Sync.System.View;
+
+namespace Game.Input
+{
+
+    public class IDPlayerMoveVector
+    {
+        public LFloat X;
+        public LFloat Y;
+
+        public LVector2 ToLVector2()
+        {
+            return new LVector2(X, Y);
+        }
+        
+    }
+    
+    /// <summary>
+    /// DPlayerSystem 的输入类
+    /// </summary>
+    [Serializable]
+    public class IDPlayer : JNInputJson
+    {
+        
+        /// <summary>
+        /// 移动的向量
+        /// </summary>
+        public IDPlayerMoveVector? MoveVector;
+        
+    }
+    
+}

JNFrame2/Assets/Scripts/Game/Input/IDPlayer.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 342bf3e39b8641a3a60be01d52293a32
+timeCreated: 1722225398

JNFrame2/Assets/Scripts/Game/Input/IDPlayer2.cs

@@ -0,0 +1,12 @@
+using JNGame.Math;
+using JNGame.Sync.System.View;
+
+namespace Game.Input
+{
+    /// <summary>
+    /// DPlayerSystem 的输入类
+    /// </summary>
+    public class IDPlayer2 : JNInputJson
+    {
+    }
+}

JNFrame2/Assets/Scripts/Game/Input/IDPlayer2.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: adc56bc7451447ddb670bb1e8edafb9c
+timeCreated: 1722248435

JNFrame2/Assets/Scripts/Game/Input/IDWorld.cs

@@ -0,0 +1,24 @@
+using System;
+using JNGame.Sync.System.View;
+
+namespace Game.Input
+{
+    /// <summary>
+    /// DWorldSystem 的输入类
+    /// </summary>
+    [Serializable]
+    public class IDWorld : JNInputJson
+    {
+        
+        /// <summary>
+        /// 创建球
+        /// </summary>
+        public bool IsAdd;
+
+        /// <summary>
+        /// 主角创建
+        /// </summary>
+        public bool IsPlayerCreate;
+
+    }
+}

JNFrame2/Assets/Scripts/Game/Input/IDWorld.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f2f47660de0d4e36b6b6a58f674fbc24
+timeCreated: 1721635974

JNFrame2/Assets/Scripts/Game/Logic.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b63cf61a85a24222952513854b17d4ec
+timeCreated: 1712748558

JNFrame2/Assets/Scripts/Game/Logic/Entity.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4f606ce125c442629b63f210beeabaa2
+timeCreated: 1712734968

JNFrame2/Assets/Scripts/Game/Logic/Entity/EDContexts.cs

@@ -0,0 +1,15 @@
+using Entitas;
+using Game.JNGFrame.Logic.Entity.Contexts;
+using JNGame.Sync.Entity;
+using JNGame.Sync.Frame.Entity;
+using JNGame.Sync.State.Tile.Entity;
+
+namespace Game.JNGFrame.Logic.Entity
+{
+    public class EDContexts : JNTileContexts
+    {
+        
+        public override IContext[] allContexts { get; } = { new EDNodeContext(),new EDPlayerContext() };
+
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/Entity/EDContexts.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: dfdb770e32914215b20ea0b4722157cf
+timeCreated: 1712736751

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f3cfa4711bbd4f9792fbc3070838c8f5
+timeCreated: 1720855417

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ce99e4925cfe4cf6a4551f4bc4e07fdc
+timeCreated: 1720749441

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/Components.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a0bc49819e5242139ad5104c369b8c82
+timeCreated: 1720864794

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/Components/EDMoveComponent.cs

@@ -0,0 +1,114 @@
+using DotRecast.Detour.Crowd;
+using Game.JNGFrame.Logic.System;
+using JNGame.Math;
+using JNGame.Sync.Entity.Component;
+using JNGame.Sync.State.Tile.Entity.Component;
+
+namespace Game.JNGFrame.Logic.Entity.Components
+{
+    /// <summary>
+    /// 移动组件
+    /// </summary>
+    public class EDMoveComponent : JNTileComponent
+    {
+
+        public DMapSystem Map => GetSystem<DMapSystem>();
+
+        /// <summary>
+        /// 避障配置
+        /// </summary>
+        private DtCrowdAgentParams _info;
+
+        /// <summary>
+        /// 移动速度
+        /// </summary>
+        private LFloat _speed = LFloat.One;
+
+        public LFloat Speed
+        {
+            get => _speed;
+            set
+            {
+                _speed = value;
+                _info.maxSpeed = _speed;
+                _info.maxAcceleration = _info.maxSpeed * 4;
+            }
+        }
+
+        public override void OnSyncStart()
+        {
+            base.OnSyncStart();
+            _info = Map.GetAgentParams();
+            Speed = Speed;
+            AddAgent();
+        }
+
+        public override void OnTileEnter()
+        {
+            base.OnTileEnter();
+            AddAgent();
+        }
+
+        public override void OnTileExit()
+        {
+            base.OnTileExit();
+            DelAgent();
+        }
+
+        /// <summary>
+        /// 添加避障
+        /// </summary>
+        public void AddAgent()
+        {
+            if(IsHost) Map.AddAgent(Entity.Id,Entity.Position,_info);
+        }
+
+        /// <summary>
+        /// 删除避障
+        /// </summary>
+        public void DelAgent()
+        {
+            Map.DelAgent(Entity.Id);
+        }
+
+        /// <summary>
+        /// 设置位置
+        /// </summary>
+        /// <param name="spawn"></param>
+        public void SetPosition(LVector3 spawn)
+        {
+            Entity.Transform.Position = Map.GetNearbyPoints(spawn);
+            DelAgent();
+            AddAgent();
+        }
+
+        /// <summary>
+        /// 设置移动目标
+        /// </summary>
+        public void Go(LVector3 spawn)
+        {
+            Map.MoveAgent(Entity.Id, Map.GetNearbyPoints(spawn));
+        }
+
+        /// <summary>
+        /// 向量移动
+        /// </summary>
+        public void Vector(LVector2 vector)
+        {
+            Map.VectorMoveAgent(Entity.Id, vector * Speed);
+        }
+
+        public override void OnSyncUpdate()
+        {
+            base.OnSyncUpdate();
+            var npos = Map.GetAgent(Entity.Id).npos;
+            Entity.Transform.Position = new LVector3((LFloat)npos.X, (LFloat)npos.Y, (LFloat)npos.Z);
+        }
+
+        public override void OnSyncDestroy()
+        {
+            base.OnSyncDestroy();
+            DelAgent();
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/Components/EDMoveComponent.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d0346ed1171e4add9c2dd1f43d7d13d7
+timeCreated: 1720864691

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/Controller.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7a0c80afea4d4209bb59b4725c030013
+timeCreated: 1723013031

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/Controller/EDPlayerController.cs

@@ -0,0 +1,58 @@
+using Game.Input;
+using Game.JNGFrame.Logic.Entity.Components;
+using JNGame.Math;
+using JNGame.Sync.State.Tile.Entity.Component;
+
+namespace Game.JNGFrame.Logic.Entity.Controller
+{
+    /// <summary>
+    /// 角色控制器
+    /// </summary>
+    public class EDPlayerController : JNTileComponent
+    {
+        
+        /// <summary>
+        /// 权限Id
+        /// </summary>
+        private int _auth;
+        public int Auth => _auth;
+        
+        public DInputSystem Input => GetSystem<DInputSystem>();
+
+        public EDMoveComponent Move => Entity.GetComponent<EDMoveComponent>();
+
+
+        /// <summary>
+        /// 绑定权限
+        /// </summary>
+        /// <param name="id"></param>
+        public void AuthBind(int id)
+        {
+            _auth = id;
+        }
+
+        public override void OnSyncStart()
+        {
+            base.OnSyncStart();
+            Move.Speed = LFloat.L10;
+        }
+
+        public override void OnSyncUpdate()
+        {
+            base.OnSyncUpdate();
+            OnMoveUpdate();
+        }
+
+        /// <summary>
+        /// 移动更新
+        /// </summary>
+        private void OnMoveUpdate()
+        {
+            
+            if (Input.SInput<IDPlayer>(Auth) is not IDPlayer input || input.MoveVector is null) return;
+            Move.Vector(input.MoveVector.ToLVector2());
+            
+        }
+        
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/Controller/EDPlayerController.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2d63a18dd1f04046ac493221c82130e8
+timeCreated: 1723013044

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/EDNodeLookup.cs

@@ -0,0 +1,25 @@
+using System;
+using JNGame.Sync.Frame.Entity.Components;
+using JNGame.Util.Types;
+
+namespace Game.JNGFrame.Logic.Entity.Components
+{
+    public class EDNodeLookup : JNEntityLookup
+    {
+        
+        //移动组件
+        public int Movement { get; set; }
+
+        protected override void BindIndex()
+        {
+            base.BindIndex();
+            Movement = Next();
+        }
+
+        protected override void BindType(KeyValue<int, Type> types)
+        {
+            base.BindType(types);
+            types.Add(Movement,typeof(EDMoveComponent));
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/EDNodeLookup.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: aeea4b9b15934aba9d557d99f16c4d3f
+timeCreated: 1720749462

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/EDPlayerLookup.cs

@@ -0,0 +1,31 @@
+using System;
+using Game.JNGFrame.Logic.Entity.Controller;
+using JNGame.Sync.Frame.Entity.Components;
+using JNGame.Util.Types;
+using UnityEngine;
+
+namespace Game.JNGFrame.Logic.Entity.Components
+{
+    public class EDPlayerLookup : JNEntityLookup
+    {
+        
+        //移动组件
+        public int Movement { get; set; }
+        public int Controller { get; set; }
+
+        protected override void BindIndex()
+        {
+            base.BindIndex();
+            Movement = Next();
+            Controller = Next();
+        }
+
+        protected override void BindType(KeyValue<int, Type> types)
+        {
+            base.BindType(types);
+            types.Add(Movement,typeof(EDMoveComponent));
+            types.Add(Controller,typeof(EDPlayerController));
+        }
+        
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Component/EDPlayerLookup.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: df072d4041fb497cb8122a7449c04455
+timeCreated: 1722225086

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Contexts.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ab58dfb4e61e45d587eb9695240e9cbc
+timeCreated: 1712737231

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Contexts/EDNodeContext.cs

@@ -0,0 +1,16 @@
+using Game.JNGFrame.Logic.Entity.Components;
+using JNGame.Sync.Frame.Entity;
+using JNGame.Sync.State.Tile.Entity;
+
+namespace Game.JNGFrame.Logic.Entity.Contexts
+{
+    public sealed partial class EDNodeContext : JNTileContext<EDNode>
+    {
+        protected override EDNode BindComponent(EDNode entity)
+        {
+            base.BindComponent(entity);
+            entity.AddComponent<EDMoveComponent>();
+            return entity;
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Contexts/EDNodeContext.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 71e757d251804ce4b37ba605cbf54016
+timeCreated: 1712737245

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Contexts/EDPlayerContext.cs

@@ -0,0 +1,17 @@
+using Game.JNGFrame.Logic.Entity.Components;
+using Game.JNGFrame.Logic.Entity.Controller;
+using JNGame.Sync.State.Tile.Entity;
+
+namespace Game.JNGFrame.Logic.Entity.Contexts
+{
+    public sealed partial class EDPlayerContext : JNTileContext<EDPlayer>
+    {
+        protected override EDPlayer BindComponent(EDPlayer entity)
+        {
+            base.BindComponent(entity);
+            entity.AddComponent<EDMoveComponent>();
+            entity.AddComponent<EDPlayerController>();
+            return entity;
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/Contexts/EDPlayerContext.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2358fccfc7ee4ab6b0ccdabc5e75060b
+timeCreated: 1722225016

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/EDNode.cs

@@ -0,0 +1,27 @@
+using Game.JNGFrame.Logic.Entity.Components;
+using Game.JNGState.Logic.Data;
+using JNGame.Sync.Frame.Entity.Components;
+using JNGame.Sync.State.Tile.Entity;
+using JNGame.Sync.System.Data;
+using NotImplementedException = System.NotImplementedException;
+
+namespace Game.JNGFrame.Logic.Entity
+{
+    public class EDNode : JNTileEntity
+    {
+
+        public EDMoveComponent Move => CLookup.Query<EDMoveComponent>(this);
+
+
+        public override void TileSyncData(ISTileData data)
+        {
+            var nodeData = data as EDNodeData;
+            Transform.Position = nodeData.Value.Position.ToLVector3();
+        }
+
+        public override JNEntityLookup NewCLookup()
+        {
+            return new EDNodeLookup();
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/EDNode.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4c4bcab5b4174eda9afc6b994666a72f
+timeCreated: 1712736545

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/EDPlayer.cs

@@ -0,0 +1,31 @@
+using Game.JNGFrame.Logic.Entity.Components;
+using Game.JNGFrame.Logic.Entity.Controller;
+using Game.JNGState.Logic.Data;
+using JNGame.Math;
+using JNGame.Sync.Frame.Entity.Components;
+using JNGame.Sync.State.Tile.Entity;
+using JNGame.Sync.System.Data;
+using NotImplementedException = System.NotImplementedException;
+
+namespace Game.JNGFrame.Logic.Entity
+{
+    public class EDPlayer : JNTileEntity
+    {
+        
+        public EDMoveComponent Move => CLookup.Query<EDMoveComponent>(this);
+        public EDPlayerController Controller => CLookup.Query<EDPlayerController>(this);
+
+        public override void TileSyncData(ISTileData data)
+        {
+            var nodeData = data as EDPlayerData;
+            Controller.AuthBind(nodeData.Value.Auth.Value);
+            Transform.Position = nodeData.Value.Position.ToLVector3();
+        }
+
+        public override JNEntityLookup NewCLookup()
+        {
+            return new EDPlayerLookup();
+        }
+        
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/Entity/Nodes/EDPlayer.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 020606cd1a564efeb88ce4df7c6fce56
+timeCreated: 1722225061

JNFrame2/Assets/Scripts/Game/Logic/System.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 66f9154d1a7c41e88a3c95d0408dc2cf
+timeCreated: 1720863460

JNFrame2/Assets/Scripts/Game/Logic/System/DDataSystem.cs

@@ -0,0 +1,26 @@
+using AppGame;
+using Game.Logic.System;
+using JNGame.Map;
+using JNGame.Map.DotRecast.Util;
+using JNGame.Sync.System;
+using Service;
+
+namespace Game.JNGFrame.Logic
+{
+    /// <summary>
+    /// 游戏数据
+    /// </summary>
+    public class DDataSystem : DGBasisSystem
+    {
+        
+        public StaticMapData MapData;
+        public MeshData MapData2;
+
+        public override void OnSyncStart()
+        {
+            base.OnSyncStart();
+            MapData = App.Resource.MapData;
+            MapData2 = App.Resource.MapData2;
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/System/DDataSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5c9d6660f75144ce84276d8536a9ffc2
+timeCreated: 1715158899

JNFrame2/Assets/Scripts/Game/Logic/System/DGBasisSystem.cs

@@ -0,0 +1,34 @@
+using JNGame.Math;
+using JNGame.Sync.Frame.Service;
+using JNGame.Sync.State.Tile;
+using JNGame.Sync.System;
+
+namespace Game.Logic.System
+{
+    public class DGBasisSystem : SLogicSystem
+    {
+        
+        public JNRandomSystem Random => GetSystem<JNRandomSystem>();
+        
+        //判断是否是Tile模式
+        public bool IsTile()
+        {
+            return Sync is JNSSTileServerService;
+        }
+        
+        //获取当前权限瓦块随机点
+        public LVector3 GetTileRandom()
+        {
+            if (Sync is JNSSTileServerService tileServer)
+            {
+                return new LVector3(
+                    Random.Float(tileServer.MinContains.x,tileServer.MaxContains.x),
+                    LFloat.Zero,
+                    Random.Float(tileServer.MinContains.y,tileServer.MaxContains.y)
+                );
+            }
+            return LVector3.Down;
+        }
+        
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/System/DGBasisSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c42fd1121fb849b38dc7f94db9c3f3df
+timeCreated: 1722861514

JNFrame2/Assets/Scripts/Game/Logic/System/DMapSystem.cs

@@ -0,0 +1,107 @@
+using System.Collections.Generic;
+using DotRecast.Core.Numerics;
+using DotRecast.Detour;
+using DotRecast.Detour.Crowd;
+using Game.Logic.System;
+using JNGame.Map.DotRecast;
+using JNGame.Math;
+using JNGame.Sync.System;
+using UnityEngine;
+
+namespace Game.JNGFrame.Logic.System
+{
+    /// <summary>
+    /// 地图
+    /// </summary>
+    public class DMapSystem : DGBasisSystem
+    {
+
+        public DotRecastRoot Root;
+
+        public override void OnSyncStart()
+        {
+            base.OnSyncStart();
+            Root = new DotRecastRoot(GetSystem<DDataSystem>().MapData2);
+            Debug.Log($"DemoMapService - 加载完成地图");
+        }
+
+        public override void OnSyncUpdate()
+        {
+            base.OnSyncUpdate();
+            Root.Update(new LFloat(null,Sync.DeltaTime));
+        }
+        
+        public DtCrowdAgentParams GetAgentParams()
+        {
+            int updateFlags = DtCrowdAgentUpdateFlags.DT_CROWD_ANTICIPATE_TURNS |
+                              DtCrowdAgentUpdateFlags.DT_CROWD_OPTIMIZE_VIS |
+                              DtCrowdAgentUpdateFlags.DT_CROWD_OPTIMIZE_TOPO |
+                              DtCrowdAgentUpdateFlags.DT_CROWD_OBSTACLE_AVOIDANCE;
+            DtCrowdAgentParams ap = new DtCrowdAgentParams();
+            ap.radius = (LFloat)0.6f;
+            ap.height = (LFloat)2f;
+            ap.maxAcceleration = (LFloat)8.0f;
+            ap.maxSpeed = (LFloat)6f;
+            ap.collisionQueryRange = ap.radius * (LFloat)12f;
+            ap.pathOptimizationRange = ap.radius * (LFloat)30f;
+            ap.updateFlags = updateFlags;
+            ap.obstacleAvoidanceType = 0;
+            ap.separationWeight = (LFloat)2f;
+            return ap;
+        }
+
+        /// <summary>
+        /// 返回最近点
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public LVector3 GetNearbyPoints(LVector3 pos)
+        {
+            return Root.GetNearbyPoints(pos);
+        }
+        /// <summary>
+        /// 查询导航
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public List<DtStraightPath> FindPath(LVector3 start,LVector3 end)
+        {
+            return Root.FindPath(start,end);
+        }
+        
+        //添加避障
+        public void AddAgent(long id,LVector3 start)
+        {
+            Root.AddAgent(id,new RcVec3f(start.x,start.y,start.z));
+        }
+        public void AddAgent(long id,LVector3 start,DtCrowdAgentParams agentParams)
+        {
+            Root.AddAgent(id,new RcVec3f(start.x,start.y,start.z),agentParams);
+        }
+        
+        //删除避障
+        public void DelAgent(long id)
+        {
+            Root.DelAgent(id);
+        }
+        
+        //移动避障
+        public void MoveAgent(long id,LVector3 move)
+        {
+            Root.MoveAgent(id,new RcVec3f(move.x,move.y,move.z));
+        }
+        
+        //向量移动避障
+        public void VectorMoveAgent(long id,LVector2 vector)
+        {
+            Root.VectorMoveAgent(id,new RcVec3f(vector.x,0,vector.y));
+        }
+        
+        //获取避障
+        public DtCrowdAgent GetAgent(long id)
+        {
+            return Root.GetAgent(id);
+        }
+        
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/System/DMapSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9f6e62838e334b6e983b238063cc2479
+timeCreated: 1715157690

JNFrame2/Assets/Scripts/Game/Logic/System/DPlayerSystem.cs

@@ -0,0 +1,46 @@
+using DotRecast.Core.Collections;
+using Game.Input;
+using Game.JNGFrame.Logic.Entity;
+using Game.JNGFrame.Logic.Entity.Contexts;
+using JNGame.Math;
+using JNGame.Sync.Frame.Service;
+using JNGame.Sync.System;
+using UnityEngine;
+
+namespace Game.Logic.System
+{
+    /// <summary>
+    /// 玩家逻辑
+    /// </summary>
+    public class DPlayerSystem : DGBasisSystem
+    {
+        
+        //Node 节点
+        public EDPlayer[] Nodes => NodeContext.GetHostEntities();
+        public EDPlayerContext NodeContext => Contexts.GetContext<EDPlayerContext>();
+        
+        public DInputSystem Input => GetSystem<DInputSystem>();
+
+        public override void OnSyncUpdate()
+        {
+            base.OnSyncUpdate();
+            
+            //创建角色
+            GetSystem<DInputSystem>().SInput<IDWorld>().ForEach(child =>
+            {
+                var key = child.Key;
+                var idWorld = (IDWorld)child.Value;
+                
+                if (idWorld != null && idWorld.IsPlayerCreate)
+                {
+                    var entity = NodeContext.CreateEntity();
+                    entity.Controller.AuthBind(key);
+                    var spawn = new LVector3(Random.Float(0, 0),Random.Float(0, 0),Random.Float(0, 0));
+                    entity.Move.SetPosition(spawn);
+                }
+                
+            });
+
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/System/DPlayerSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7b59673517e1408295737003f44b2690
+timeCreated: 1722224946

JNFrame2/Assets/Scripts/Game/Logic/System/DWorldSystem.cs

@@ -0,0 +1,54 @@
+using System.Linq;
+using Game.Input;
+using Game.JNGFrame.Logic.Entity;
+using Game.JNGFrame.Logic.Entity.Contexts;
+using Game.Logic.System;
+using JNGame.Math;
+using JNGame.Sync.Frame.Service;
+using JNGame.Sync.System;
+
+namespace Game.JNGFrame.Logic.System
+{
+    public class DWorldSystem : DGBasisSystem
+    {
+
+        //Node 节点
+        public EDNode[] Nodes => NodeContext.GetHostEntities();
+        public EDNodeContext NodeContext => Contexts.GetContext<EDNodeContext>();
+
+        public override void OnSyncUpdate()
+        {
+
+            base.OnSyncUpdate();
+            if (GetSystem<DInputSystem>().SInputOne<IDWorld>() is not IDWorld { IsAdd: true }) return;
+                
+            //超过500 则 销毁第一个实体
+            if (Nodes.Length >= 100)
+            {
+                var node = Nodes[0];
+                node.Destroy();
+                return;
+            }
+
+
+            var max = 100;
+            if (IsTile())
+            {
+                var entity = Contexts.GetContext<EDNodeContext>().CreateEntity();
+                entity.Move.SetPosition(GetTileRandom());
+                entity.Move.Go(GetTileRandom());
+            }
+            else
+            {
+                var entity = Contexts.GetContext<EDNodeContext>().CreateEntity();
+                var spawn = new LVector3(Random.Float(0, max),Random.Float(0, 100),Random.Float(0, max));
+                entity.Move.SetPosition(spawn);
+                spawn = new LVector3(Random.Float(0, max),Random.Float(0, 100),Random.Float(0, max));
+                entity.Move.Go(spawn);
+            }
+            
+            
+        }
+        
+    }
+}

JNFrame2/Assets/Scripts/Game/Logic/System/DWorldSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 00e91648e3cd42a8ae1399000b88fdd6
+timeCreated: 1712720318

JNFrame2/Assets/Scripts/Game/View.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 70895d8be1b84f40ac7ee3c61c8bdbaa
+timeCreated: 1712748571

JNFrame2/Assets/Scripts/Game/View/DViewSystem.cs

@@ -0,0 +1,38 @@
+using Game.JNGFrame.View.Entity;
+using JNGame.Sync.System;
+using JNGame.Sync.View;
+
+namespace Game.JNGFrame.View
+{
+    public class DViewSystem : SViewSystem
+    {
+
+        private readonly IViewData[] views;
+
+        public DViewSystem()
+        {
+            views = new IViewData[] {
+                new VDNodes(this),      //显示Demo实体
+                new VDPlayers(this),    //显示玩家实体
+            };
+        }
+
+        public override void OnSyncUpdate()
+        {
+            base.OnSyncUpdate();
+            foreach (var view in views)
+            {
+                view.Execute();
+            }
+        }
+        // public override void Execute()
+        // {
+        //     foreach (var view in views)
+        //     {
+        //         view.Execute();
+        //     }
+        // }
+        
+    }
+    
+}

JNFrame2/Assets/Scripts/Game/View/DViewSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b957e5e22fd84759a0ece337922e616d
+timeCreated: 1712750046

JNFrame2/Assets/Scripts/Game/View/Entity.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7723835c77a04a6f98cf04c58f01b9c1
+timeCreated: 1712750018

JNFrame2/Assets/Scripts/Game/View/Entity/VDNodes.cs

@@ -0,0 +1,48 @@
+using AppGame;
+using DG.Tweening;
+using Game.JNGFrame.Logic.Entity;
+using Game.JNGFrame.Logic.System;
+using Game.JNGState.Logic.Data;
+using JNGame.Math;
+using JNGame.Sync.System;
+using JNGame.Sync.View;
+using Service;
+using UnityEngine;
+
+namespace Game.JNGFrame.View.Entity
+{
+    public class VDNodes : ViewData<EDNodeData>
+    {
+        public GameObject VWorld => App.Resource.VWorld;
+        public GameObject Player1 => App.Resource.Player1;
+        public VDNodes(SViewSystem root) : base(root)
+        {
+        }
+
+        public override void ViewUpdate(EDNodeData data, GameObject view)
+        {
+            
+            view.name = $"Node_{data.Id}";
+            if (data.Value.Position != null)
+            {
+                view.transform.DOMove(data.Value.Position.ToVector3(), 0.5f);
+            }
+
+        }
+
+        public override GameObject NewView(EDNodeData data)
+        {
+            return Object.Instantiate(Player1, VWorld.transform);
+        }
+
+        public override EDNodeData[] GetData()
+        {
+            return GetService<EDNodeDataSystem>().Datas;
+        }
+
+        public override void ViewRemove(GameObject view)
+        {
+            Object.Destroy(view);
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/View/Entity/VDNodes.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 658e1c8925f546749725181702b989e9
+timeCreated: 1715169861

JNFrame2/Assets/Scripts/Game/View/Entity/VDPlayers.cs

@@ -0,0 +1,78 @@
+using AppGame;
+using AppGame.Sync;
+using Cinemachine;
+using DG.Tweening;
+using Game.JNGFrame.Logic.Entity;
+using Game.JNGFrame.Logic.System;
+using Game.JNGState.Logic.Data;
+using JNGame.Math;
+using JNGame.Sync.System;
+using JNGame.Sync.View;
+using Service;
+using UnityEngine;
+
+namespace Game.JNGFrame.View.Entity
+{
+    public class VDPlayers : ViewData<EDPlayerData>
+    {
+        public GameObject VWorld => App.Resource.VWorld;
+        public GameObject Player1 => App.Resource.Player1;
+        public CinemachineFreeLook FreeLook => App.Resource.FreeLook;
+
+        public Vector3 pos = new Vector3(0, 0, 0);
+        
+        public Vector3 target = new Vector3(0, 0, 0);
+
+        public VDPlayers(SViewSystem root) : base(root)
+        {
+        }
+
+        public override void ViewUpdate(EDPlayerData data, GameObject view)
+        {
+            view.name = $"Player_{data.Id}";
+            
+            //更新位置
+            if (data.Value.Position != null)
+            {
+                view.transform.DOKill();
+                view.transform.DOMove(data.Value.Position.ToVector3(), 0.5f);
+                // view.transform.DOKill();
+                // view.transform.DOMove(pos = pos + new Vector3(0,0,10f / 15), 0.07f);
+            }
+            // view.transform.position += new Vector3(0, 0,3f * Time.deltaTime);
+            // view.transform.position += new Vector3(0, 0,30f * Time.deltaTime);
+            // view.transform.position = new Vector3(0, 10, view.transform.position.z);
+            
+            //权限操作
+            if (App.IsClient() && data.Value.Auth == App.ClientID)
+            {
+                
+                //绑定相机
+                FreeLook.LookAt = view.transform;
+                FreeLook.Follow = view.transform;
+                
+                //更新玩家位置
+                if (data.Value.Position != null) App.Game.GetClient<JNGTileClientSystem>()?.SetPlayerPosition(data.Value.Position.ToLVector3());
+                
+            }
+            
+        }
+
+        public override GameObject NewView(EDPlayerData data)
+        {
+            var gameObject = Object.Instantiate(Player1, VWorld.transform);
+            // gameObject.transform.DOMove(gameObject.transform.position + new Vector3(0,0,1000), 100);
+            return gameObject;
+        }
+
+        public override EDPlayerData[] GetData()
+        {
+            return GetService<EDPlayerDataSystem>().Datas;
+        }
+
+        public override void ViewRemove(GameObject view)
+        {
+            Object.Destroy(view);
+        }
+    }
+}

JNFrame2/Assets/Scripts/Game/View/Entity/VDPlayers.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c45ed812046443709890cdd79dfdcb19
+timeCreated: 1722252921