From 77db4d7d71b29c8d76f155d51e83662aa8278a01 Mon Sep 17 00:00:00 2001 From: "PC-20230316NUNE\\Administrator" <2858626794@qq.com> Date: Fri, 23 Aug 2024 10:48:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=A0=E7=BC=9D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JNGame/Map/DotRecast/DotRecastRoot.cs | 18 +++++++------ .../JNGame/Network/Proto/JNSyncMessage.cs | 10 +++---- .../JNGame/Network/Proto/JNSyncMessage.proto | 2 +- .../Sync/App/Tile/Entity/JNTileContext.cs | 2 +- .../Sync/App/Tile/JNSSTileServerService.cs | 7 ++++- .../Assets/JNGame/Sync/Entity/JNEntity.cs | 10 +++---- JNFrame2/Assets/JNGame/Sync/IJNSyncId.cs | 2 +- .../Sync/System/Data/SStateDataSystem.cs | 20 +++++++------- .../Sync/System/Data/STileDataSystem.cs | 20 +++++++------- .../Sync/System/Logic/JNRandomSystem.cs | 26 ++++--------------- .../Assets/JNGame/Sync/System/SDataSystem.cs | 8 +++--- .../Assets/JNGame/Sync/System/SLogicSystem.cs | 4 +-- JNFrame2/Assets/JNGame/Sync/View/ViewData.cs | 4 +-- JNFrame2/Assets/Scripts/AppGame/GAPI.cs | 1 + .../AppGame/Sync/Tile/JNGTileServerSystem.cs | 4 ++- .../Assets/Scripts/AppGame/Systems/JNGGame.cs | 2 +- .../Scripts/Game/Data/EDNodeDataSystem.cs | 4 +-- .../Scripts/Game/Data/EDPlayerDataSystem.cs | 4 +-- .../Scripts/Game/Data/GDataBaseSystem.cs | 2 +- .../Scripts/Game/Logic/System/DMapSystem.cs | 12 ++++----- ...hadercompiler-UnityShaderCompiler.exe0.log | 1 + .../UserSettings/Layouts/default-2021.dwlt | 24 ++++++++--------- .../frame/controller/DemoController.java | 9 +++++++ 23 files changed, 98 insertions(+), 98 deletions(-) diff --git a/JNFrame2/Assets/JNGame/Map/DotRecast/DotRecastRoot.cs b/JNFrame2/Assets/JNGame/Map/DotRecast/DotRecastRoot.cs index 24b0cdc0..90a7f9da 100644 --- a/JNFrame2/Assets/JNGame/Map/DotRecast/DotRecastRoot.cs +++ b/JNFrame2/Assets/JNGame/Map/DotRecast/DotRecastRoot.cs @@ -23,11 +23,11 @@ namespace JNGame.Map.DotRecast //智能体避障 public DtCrowd Crowd { private set; get; } - private Dictionary agents; + private Dictionary agents; public DotRecastRoot(MeshData data) { - agents = new Dictionary(); + agents = new Dictionary(); //初始化导航数据 InitNavMesh(data); //初始化避障数据 @@ -103,17 +103,19 @@ namespace JNGame.Map.DotRecast } //添加避障 - public void AddAgent(long id,RcVec3f start) + public void AddAgent(ulong id,RcVec3f start) { + DelAgent(id); agents.Add(id,Crowd.AddAgent(start, GetAgentParams())); } - public void AddAgent(long id,RcVec3f start,DtCrowdAgentParams agentParams) + public void AddAgent(ulong id,RcVec3f start,DtCrowdAgentParams agentParams) { + DelAgent(id); agents.Add(id,Crowd.AddAgent(start, agentParams)); } //添加避障 - public void DelAgent(long id) + public void DelAgent(ulong id) { if (agents.ContainsKey(id)) { @@ -123,7 +125,7 @@ namespace JNGame.Map.DotRecast } //移动避障 - public void MoveAgent(long id,RcVec3f move) + public void MoveAgent(ulong id,RcVec3f move) { DtCrowdAgent agent = agents[id]; @@ -133,14 +135,14 @@ namespace JNGame.Map.DotRecast } //向量移动避障 - public void VectorMoveAgent(long id,RcVec3f vector) + public void VectorMoveAgent(ulong id,RcVec3f vector) { DtCrowdAgent agent = agents[id]; Crowd.RequestMoveVelocity(agent,vector); } //获取避障 - public DtCrowdAgent GetAgent(long id) + public DtCrowdAgent GetAgent(ulong id) { return agents[id]; } diff --git a/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs b/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs index fdf89d5b..74879dd4 100644 --- a/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs +++ b/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs @@ -33,7 +33,7 @@ public static partial class JNSyncMessageReflection { "SACIAQFCCgoIX21lc3NhZ2UiKQoLSk5TdGF0ZURhdGESEQoEZGF0YRgCIAEo", "DEgAiAEBQgcKBV9kYXRhIpEBCg9KTlN0YXRlSXRlbURhdGESDQoFTmV0SUQY", "ASABKAUSMAoIbWVzc2FnZXMYAiADKAsyHi5KTlN0YXRlSXRlbURhdGEuTWVz", - "c2FnZXNFbnRyeRo9Cg1NZXNzYWdlc0VudHJ5EgsKA2tleRgBIAEoAxIbCgV2", + "c2FnZXNFbnRyeRo9Cg1NZXNzYWdlc0VudHJ5EgsKA2tleRgBIAEoBBIbCgV2", "YWx1ZRgCIAEoCzIMLkpOU3RhdGVEYXRhOgI4ASIwCg5KTlN0YXRlQWxsRGF0", "YRIeCgRkYXRhGAIgAygLMhAuSk5TdGF0ZUl0ZW1EYXRhIkEKEUpOU3RhdGVU", "aWxlSW5wdXRzEgsKA3RJZBgBIAEoBRIfCgdtZXNzYWdlGAIgASgLMg4uSk5G", @@ -1813,15 +1813,15 @@ public sealed partial class JNStateItemData : pb::IMessage /// Field number for the "messages" field. public const int MessagesFieldNumber = 2; - private static readonly pbc::MapField.Codec _map_messages_codec - = new pbc::MapField.Codec(pb::FieldCodec.ForInt64(8, 0L), pb::FieldCodec.ForMessage(18, global::JNStateData.Parser), 18); - private readonly pbc::MapField messages_ = new pbc::MapField(); + private static readonly pbc::MapField.Codec _map_messages_codec + = new pbc::MapField.Codec(pb::FieldCodec.ForUInt64(8, 0UL), pb::FieldCodec.ForMessage(18, global::JNStateData.Parser), 18); + private readonly pbc::MapField messages_ = new pbc::MapField(); /// ///状态bytes /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::MapField Messages { + public pbc::MapField Messages { get { return messages_; } } diff --git a/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto b/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto index 3b4167d3..ad9bc11f 100644 --- a/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto +++ b/JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto @@ -49,7 +49,7 @@ message JNStateData{ // 更新状态 message JNStateItemData{ int32 NetID = 1; //同步Id - map messages = 2; //状态bytes + map messages = 2; //状态bytes } // 全量状态 diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs b/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs index d4094888..59c52315 100644 --- a/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs @@ -43,7 +43,7 @@ namespace JNGame.Sync.State.Tile.Entity } } - public T TileSyncCreate(long id) + public T TileSyncCreate(ulong id) { //判断是否有这个Id实体 diff --git a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileServerService.cs b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileServerService.cs index 53d5e25f..02e60da5 100644 --- a/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileServerService.cs +++ b/JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileServerService.cs @@ -32,6 +32,11 @@ namespace JNGame.Sync.State.Tile /// public int TID { get; private set; } + /// + /// 随机数大小(100000000000UL * RandomSize) + /// + public int RandomSize { get; protected set; } = 1; + /// /// 区块最大最小位置 /// @@ -70,7 +75,7 @@ namespace JNGame.Sync.State.Tile { //根据区块设置Id 起始值 var random = base.CreateRandom(); - random.SetIdValue(100000000000L * TID,(100000000000L * (TID + 1) - 1)); + random.SetIdValue(100000000000UL * (ulong)RandomSize,(100000000000UL * ((ulong)RandomSize + 1) - 1)); return random; } diff --git a/JNFrame2/Assets/JNGame/Sync/Entity/JNEntity.cs b/JNFrame2/Assets/JNGame/Sync/Entity/JNEntity.cs index 1cba1c62..b2d2d4cf 100644 --- a/JNFrame2/Assets/JNGame/Sync/Entity/JNEntity.cs +++ b/JNFrame2/Assets/JNGame/Sync/Entity/JNEntity.cs @@ -33,8 +33,8 @@ namespace JNGame.Sync.Entity public abstract class JNEntity : Entitas.Entity,IJNEntity,IComparable { - private long _id; - public long Id => _id; + private ulong _id; + public ulong Id => _id; public IJNContext Context { get; private set; } @@ -50,7 +50,7 @@ namespace JNGame.Sync.Entity /// public LVector3 Position => Transform.Position; - public void OnInit(IJNContext context,long id = 0) + public void OnInit(IJNContext context,ulong id = 0) { Context = context; _id = id; @@ -58,10 +58,6 @@ namespace JNGame.Sync.Entity { _id = GetSystem().NextId(); } - else - { - GetSystem().AdaptId(id); - } } public abstract JNEntityLookup NewCLookup(); diff --git a/JNFrame2/Assets/JNGame/Sync/IJNSyncId.cs b/JNFrame2/Assets/JNGame/Sync/IJNSyncId.cs index d439dddf..6326e437 100644 --- a/JNFrame2/Assets/JNGame/Sync/IJNSyncId.cs +++ b/JNFrame2/Assets/JNGame/Sync/IJNSyncId.cs @@ -3,7 +3,7 @@ public interface IJNSyncId { - public long Id { get; } + public ulong Id { get; } } } \ No newline at end of file diff --git a/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs index 765d1c85..24381815 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs @@ -45,12 +45,12 @@ namespace JNGame.Sync.System.Data /// /// 插入字节 /// - public void OnInsertUBytes(Dictionary bytes); + public void OnInsertUBytes(Dictionary bytes); /// /// 获取全部字节 /// - public Dictionary GetDataBytes(); + public Dictionary GetDataBytes(); } @@ -64,7 +64,7 @@ namespace JNGame.Sync.System.Data public abstract int NetID { get; } //网络通讯的更新字节数据 - protected Dictionary UBytes = new(); + protected Dictionary UBytes = new(); public SStateDataEnum Type; @@ -117,13 +117,13 @@ namespace JNGame.Sync.System.Data /// /// /// 是否清空UBytes - public abstract void OnSendUBytes(Dictionary bytes); + public abstract void OnSendUBytes(Dictionary bytes); /// /// 插入字节 /// /// - public void OnInsertUBytes(Dictionary bytes) + public void OnInsertUBytes(Dictionary bytes) { //提交数据更新 OnUByteUpdate(bytes); @@ -132,9 +132,9 @@ namespace JNGame.Sync.System.Data /// /// 获取全部字节 /// - public Dictionary GetDataBytes() + public Dictionary GetDataBytes() { - var data = new Dictionary(); + var data = new Dictionary(); lock (Data) { @@ -153,7 +153,7 @@ namespace JNGame.Sync.System.Data /// /// 将UByte提交更新 /// - public virtual void OnUByteUpdate(Dictionary bytes) + public virtual void OnUByteUpdate(Dictionary bytes) { lock (Data) { @@ -187,7 +187,7 @@ namespace JNGame.Sync.System.Data /// /// /// - public T NewObject(long id,byte[] bytes) + public T NewObject(ulong id,byte[] bytes) { var data = new T(); data.Id = id; @@ -225,7 +225,7 @@ namespace JNGame.Sync.System.Data /// /// 删除数据 /// - public virtual void Delete(long id) + public virtual void Delete(ulong id) { UBytes[id] = SDByteOperate.DELETE; } diff --git a/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs index 45375a7a..7f729bdc 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs @@ -21,13 +21,13 @@ namespace JNGame.Sync.System.Data /// /// 获取有权限的全部字节 /// - public Dictionary GetHostDataBytes(); + public Dictionary GetHostDataBytes(); /// /// 获取指定区块的全部字节 /// - public Dictionary GetTileDataBytes(int index); + public Dictionary GetTileDataBytes(int index); @@ -68,7 +68,7 @@ namespace JNGame.Sync.System.Data { } - public override void OnUByteUpdate(Dictionary bytes) + public override void OnUByteUpdate(Dictionary bytes) { base.OnUByteUpdate(bytes); if (isServer) @@ -83,11 +83,11 @@ namespace JNGame.Sync.System.Data protected virtual void OnDataSyncContext() { - Dictionary lIsTileData; + Dictionary lIsTileData; lock (Data) { - lIsTileData = new Dictionary(Data); + lIsTileData = new Dictionary(Data); } NodeContext.GetEntities().ForEach(child => @@ -155,7 +155,7 @@ namespace JNGame.Sync.System.Data { //需要删除的数据Id - var ids = new List(); + var ids = new List(); Data.ForEach(child => { @@ -175,10 +175,10 @@ namespace JNGame.Sync.System.Data } - public Dictionary GetHostDataBytes() + public Dictionary GetHostDataBytes() { - var data = new Dictionary(); + var data = new Dictionary(); lock (Data) { @@ -195,10 +195,10 @@ namespace JNGame.Sync.System.Data } - public Dictionary GetTileDataBytes(int index) + public Dictionary GetTileDataBytes(int index) { - var data = new Dictionary(); + var data = new Dictionary(); lock (Data) { diff --git a/JNFrame2/Assets/JNGame/Sync/System/Logic/JNRandomSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/Logic/JNRandomSystem.cs index 590f2f6b..23a33855 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/Logic/JNRandomSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/Logic/JNRandomSystem.cs @@ -16,9 +16,9 @@ namespace JNGame.Sync.Frame.Service private Func nRandomInt; //Id - private long _id = 0; - private long _idMin = long.MinValue; - private long _idMax = long.MaxValue; + private ulong _id = 0; + private ulong _idMin = ulong.MinValue; + private ulong _idMax = ulong.MaxValue; public JNRandomSystem(int seed) { @@ -41,12 +41,12 @@ namespace JNGame.Sync.Frame.Service return nRandomInt(max,min); } - public long NextId() + public ulong NextId() { return ++_id; } - public void SetIdValue(long min,long max) + public void SetIdValue(ulong min,ulong max) { if (_id < min) { @@ -55,21 +55,5 @@ namespace JNGame.Sync.Frame.Service _idMin = min; _idMax = max; } - - /// - /// 适配Id 用于 历史Id和新Id重复问题 - /// - /// - /// - public void AdaptId(long id) - { - if (_idMin <= id && id >= _idMax) - { - if (id > _id) - { - _id = id; - } - } - } } } \ No newline at end of file diff --git a/JNFrame2/Assets/JNGame/Sync/System/SDataSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/SDataSystem.cs index 9e4087ff..680e239a 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/SDataSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/SDataSystem.cs @@ -26,7 +26,7 @@ namespace JNGame.Sync.System /// /// 数据唯一Id /// - public long Id { get; set; } + public ulong Id { get; set; } /// /// 判断是否一样 @@ -54,12 +54,12 @@ namespace JNGame.Sync.System { //数据Id - public long Id { get; private set; } + public ulong Id { get; private set; } public JNRandomSystem Random => GetSystem(); //数据集 - public Dictionary Data = new(); + public Dictionary Data = new(); public virtual T[] Datas { get @@ -80,7 +80,7 @@ namespace JNGame.Sync.System /// /// 返回最新数据 (收集最新的ISData数据 正常来讲只有服务端会运行) /// - public virtual Dictionary GetLatest() + public virtual Dictionary GetLatest() { return new (); } diff --git a/JNFrame2/Assets/JNGame/Sync/System/SLogicSystem.cs b/JNFrame2/Assets/JNGame/Sync/System/SLogicSystem.cs index e63c916c..c8dfd9ea 100644 --- a/JNFrame2/Assets/JNGame/Sync/System/SLogicSystem.cs +++ b/JNFrame2/Assets/JNGame/Sync/System/SLogicSystem.cs @@ -9,8 +9,8 @@ namespace JNGame.Sync.System public class SLogicSystem : SBaseSystem,IJNSyncCycle,IJNSyncId { - private long _id; - public long Id => _id; + private ulong _id; + public ulong Id => _id; public virtual void OnSyncStart() { diff --git a/JNFrame2/Assets/JNGame/Sync/View/ViewData.cs b/JNFrame2/Assets/JNGame/Sync/View/ViewData.cs index a570b0a7..fa9067d5 100644 --- a/JNFrame2/Assets/JNGame/Sync/View/ViewData.cs +++ b/JNFrame2/Assets/JNGame/Sync/View/ViewData.cs @@ -17,7 +17,7 @@ namespace JNGame.Sync.View public abstract class ViewData : IViewData where T : ISData { - private Dictionary views = new(); + private Dictionary views = new(); private SViewSystem root; public SViewSystem Root => root; @@ -53,7 +53,7 @@ namespace JNGame.Sync.View if (isRest) { - List deletes = new List(); + List deletes = new List(); foreach (var child in views) { if (child.Value.Update != Update) diff --git a/JNFrame2/Assets/Scripts/AppGame/GAPI.cs b/JNFrame2/Assets/Scripts/AppGame/GAPI.cs index fba0d832..0713a24c 100644 --- a/JNFrame2/Assets/Scripts/AppGame/GAPI.cs +++ b/JNFrame2/Assets/Scripts/AppGame/GAPI.cs @@ -20,6 +20,7 @@ namespace AppGame //获取ID public UniTask> NSyncTileId = App.API.GetNews($"/sync/tile/id"); + public UniTask> NSyncTileRandomId = App.API.GetNews($"/sync/tile/random/id"); //获取端口 public UniTask> NSyncTilePort = App.API.GetNews($"/sync/tile/port"); //获取默认连接 diff --git a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs index 77d0df60..4c2e3ea4 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs @@ -49,6 +49,8 @@ namespace AppGame.Sync protected override async Task OnInit() { + RandomSize = (await App.GAPI.NSyncTileRandomId).data; + await base.OnInit(); if (isRecover) @@ -67,7 +69,7 @@ namespace AppGame.Sync { Debug.Log("[JNGTileServerSystem] 获取到恢复数据成功 正在恢复数据"); - var message = new Dictionary(); + var message = new Dictionary(); tileInfo.Data.Data.ForEach(frame => { message.Clear(); diff --git a/JNFrame2/Assets/Scripts/AppGame/Systems/JNGGame.cs b/JNFrame2/Assets/Scripts/AppGame/Systems/JNGGame.cs index b05f0402..c3a94f24 100644 --- a/JNFrame2/Assets/Scripts/AppGame/Systems/JNGGame.cs +++ b/JNFrame2/Assets/Scripts/AppGame/Systems/JNGGame.cs @@ -115,7 +115,7 @@ namespace AppGame.Systems /// public void AddState(JNStateItemData frame) { - var message = new Dictionary(); + var message = new Dictionary(); foreach (var data in frame.Messages) { message.Add(data.Key,data.Value.Data.ToByteArray()); diff --git a/JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs b/JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs index 662ab243..b8aef894 100644 --- a/JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs +++ b/JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs @@ -45,9 +45,9 @@ namespace Game.JNGState.Logic.Data public override int NetID => (int)NetDataEnum.EDNodeData; - public override Dictionary GetLatest() + public override Dictionary GetLatest() { - var nodes = new Dictionary(); + var nodes = new Dictionary(); NodeContext.GetEntities().ForEach(child => { if (nodes.ContainsKey(child.Id)) diff --git a/JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs b/JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs index a689b13c..8118e1ee 100644 --- a/JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs +++ b/JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs @@ -70,9 +70,9 @@ namespace Game.JNGState.Logic.Data public override JNTileContext NodeContext => Contexts.GetContext(); - public override Dictionary GetLatest() + public override Dictionary GetLatest() { - var nodes = new Dictionary(); + var nodes = new Dictionary(); NodeContext.GetEntities().ForEach(child => { nodes.Add(child.Id,new EDPlayerData(child)); diff --git a/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs b/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs index 79254001..0a157f22 100644 --- a/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs +++ b/JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs @@ -110,7 +110,7 @@ namespace Game.JNGState.Logic.Data { } - public override void OnSendUBytes(Dictionary bytes) + public override void OnSendUBytes(Dictionary bytes) { JNStateItemData data = new JNStateItemData(); diff --git a/JNFrame2/Assets/Scripts/Game/Logic/System/DMapSystem.cs b/JNFrame2/Assets/Scripts/Game/Logic/System/DMapSystem.cs index 8206781b..5cac2ae2 100644 --- a/JNFrame2/Assets/Scripts/Game/Logic/System/DMapSystem.cs +++ b/JNFrame2/Assets/Scripts/Game/Logic/System/DMapSystem.cs @@ -70,35 +70,35 @@ namespace Game.JNGFrame.Logic.System } //添加避障 - public void AddAgent(long id,LVector3 start) + public void AddAgent(ulong id,LVector3 start) { Root.AddAgent(id,new RcVec3f(start.x,start.y,start.z)); } - public void AddAgent(long id,LVector3 start,DtCrowdAgentParams agentParams) + public void AddAgent(ulong id,LVector3 start,DtCrowdAgentParams agentParams) { Root.AddAgent(id,new RcVec3f(start.x,start.y,start.z),agentParams); } //删除避障 - public void DelAgent(long id) + public void DelAgent(ulong id) { Root.DelAgent(id); } //移动避障 - public void MoveAgent(long id,LVector3 move) + public void MoveAgent(ulong id,LVector3 move) { Root.MoveAgent(id,new RcVec3f(move.x,move.y,move.z)); } //向量移动避障 - public void VectorMoveAgent(long id,LVector2 vector) + public void VectorMoveAgent(ulong id,LVector2 vector) { Root.VectorMoveAgent(id,new RcVec3f(vector.x,0,vector.y)); } //获取避障 - public DtCrowdAgent GetAgent(long id) + public DtCrowdAgent GetAgent(ulong id) { return Root.GetAgent(id); } diff --git a/JNFrame2/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/JNFrame2/Logs/shadercompiler-UnityShaderCompiler.exe0.log index 9f3e66e5..df098dd8 100644 --- a/JNFrame2/Logs/shadercompiler-UnityShaderCompiler.exe0.log +++ b/JNFrame2/Logs/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,3 +1,4 @@ Base path: 'D:/Unity/2021.3.35f1/Editor/Data', plugins path 'D:/Unity/2021.3.35f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +Cmd: shutdown diff --git a/JNFrame2/UserSettings/Layouts/default-2021.dwlt b/JNFrame2/UserSettings/Layouts/default-2021.dwlt index c857ea53..ea705859 100644 --- a/JNFrame2/UserSettings/Layouts/default-2021.dwlt +++ b/JNFrame2/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Game + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 90 + controlID: 82 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 91 + controlID: 83 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,7 +170,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 92 + controlID: 84 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -296,8 +296,8 @@ MonoBehaviour: y: 0 width: 452 height: 939 - 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} @@ -368,7 +368,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -489,9 +489,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: aca20000 - m_LastClickedID: 0 - m_ExpandedIDs: ba75ffff427affffb27effff087fffffc481ffffc881ffffc88dffff1e8effffda90ffffde90ffff54caffff60ccffffb6ccffff72cfffff76cfffff68d9ffff9cdbfffff2dbffffaedeffffb2deffff88e1ffffd0e3ffff26e4ffffe2e6ffffe6e6ffff0ce9ffff38ebffff8eebffff4aeeffff4eeeffff7cf6ffffd2f6ffff8ef9ffff92f9ffff18fbffff3a9000002c93000016960000049900009ca20000 + m_SelectedIDs: 788c0000 + m_LastClickedID: 35960 + m_ExpandedIDs: 20f1ffff1ef3ffff28f5ffff7ef5ffff3af8ffff3ef8fffff2faffff4a8b0000688c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -994,7 +994,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 199} m_SelectedIDs: d28c0000 m_LastClickedID: 36050 - m_ExpandedIDs: 00000000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000 + m_ExpandedIDs: 000000007a7300007c7300007e73000080730000827300008473000086730000887300008a7300008c7300008e730000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1022,7 +1022,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000 + m_ExpandedIDs: 000000007a7300007c7300007e73000080730000827300008473000086730000887300008a7300008c7300008e730000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/JisolGameServer/GFrameDemo/src/main/java/cn/jisol/ngame/frame/controller/DemoController.java b/JisolGameServer/GFrameDemo/src/main/java/cn/jisol/ngame/frame/controller/DemoController.java index 913ea92a..ced1f032 100644 --- a/JisolGameServer/GFrameDemo/src/main/java/cn/jisol/ngame/frame/controller/DemoController.java +++ b/JisolGameServer/GFrameDemo/src/main/java/cn/jisol/ngame/frame/controller/DemoController.java @@ -32,6 +32,9 @@ public class DemoController { //Id 分配 private Integer nClientId = 1; + //随机Id 分配 + private Integer nRandomId = 1; + @ApiOperation(value = "获取玩家Id") @GetMapping("/sync/tile/client/id") @@ -39,6 +42,12 @@ public class DemoController { return NewsContext.onSuccess("查询成功",nClientId++); } + @ApiOperation(value = "获取随机Id") + @GetMapping("/sync/tile/random/id") + public NewsContext getTileRandomId(){ + return NewsContext.onSuccess("查询成功",nRandomId++); + } + @ApiOperation(value = "获取Tile端口") @GetMapping("/sync/tile/port") public NewsContext getTilePort(){