提交Unity 联机Pro

This commit is contained in:
PC-20230316NUNE\Administrator
2024-08-17 14:27:18 +08:00
parent f00193b000
commit 894100ae37
7448 changed files with 854473 additions and 0 deletions

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 41060d2abb6c4d7da402a2344b4ffcf9
timeCreated: 1720606734

View File

@@ -0,0 +1,63 @@
using AppGame.Systems;
using Plugins.JNGame.System;
using Plugins.JNGame.Util;
using Service;
namespace AppGame
{
/// <summary>
/// App 环境
/// </summary>
public enum AppEnv
{
Client,
Server,
ServerClient,
}
public class App
{
public static AppEnv Env = AppEnv.ServerClient;
/// <summary>
/// 业务服务器
/// </summary>
public static readonly JNGSocket Business = new JNGSocket();
/// <summary>
/// Tile服务器
/// </summary>
public static readonly JNGServer Server = new JNGServer();
/// <summary>
/// Tile客户端
/// </summary>
public static readonly JNGClientGroup Client = new JNGClientGroup();
public static readonly JNGResService Resource = new JNGResService();
public static readonly JNGGame Game = new JNGGame();
public static readonly JNGSocket Socket = new JNGSocket();
public static readonly JAPI API = new(new JAPIConfig(){BaseURL = "http://127.0.0.1:8080"});
public static readonly GAPI GAPI = new GAPI();
public static int ClientID => Client.ClientID;
public static SystemBase[] AllSystem()
{
return new SystemBase[]
{
Business,
Client,
IsServer() ? Server : null,
Resource,
Game,
// Socket,
};
}
public static bool IsClient()
{
return Env is AppEnv.Client or AppEnv.ServerClient;
}
public static bool IsServer()
{
return Env is AppEnv.Server or AppEnv.ServerClient;
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 2195ef86653b46b598afc902afa35d36
timeCreated: 1721384370

View File

@@ -0,0 +1,57 @@
using AppGame;
using AppGame.Sync;
using Cinemachine;
using Game.Input;
using JNGame;
using JNGame.Sync.Debuger;
using UnityEngine;
public class DApplication : MonoBehaviour
{
public GameObject Player1;
public GameObject VWorld;
public CinemachineFreeLook FreeLook;
private async void Awake()
{
await JNetGame.Instance.Init(App.AllSystem());
//绑定资源
App.Resource.Register(VWorld,Player1,FreeLook);
//开始运行同步
if (App.IsServer())
{
var tileServer = App.Game.Start<JNGTileServerSystem>();
JNTileServerDebuger.Instance.Add(tileServer);
}
if (App.IsClient()) App.Game.Start<JNGTileClientSystem>();
}
private void Update()
{
App.Game.Update();
}
public void OnClickPlayerCreate()
{
var input = App.Game.GetInput<IDWorld>();
input.IsPlayerCreate = true;
}
public void OnClickButton()
{
var input = App.Game.GetInput<IDWorld>();
input.IsAdd = true;
}
public void OnClickServerCreate()
{
App.Game.Start<JNGTileServerSystem>();
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f213ebe3a8895ee42b56cb52bb2cb44b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,31 @@
using System;
using Cysharp.Threading.Tasks;
using Plugins.JNGame.Util;
namespace AppGame
{
public class TileServerInfo
{
public String id;
public String ip;
public int port;
}
/// <summary>
/// 游戏API
/// </summary>
public class GAPI
{
//获取ID
public UniTask<NewsContext<int>> NSyncTileId = App.API.GetNews<int>($"/sync/tile/id");
//获取端口
public UniTask<NewsContext<int>> NSyncTilePort = App.API.GetNews<int>($"/sync/tile/port");
//获取默认连接
public UniTask<NewsContext<TileServerInfo>> NSyncTileServer(int index) => App.API.GetNews<TileServerInfo>($"/sync/tile/server?index={index}");
//获取玩家Id
public UniTask<NewsContext<int>> NSyncTileClientId = App.API.GetNews<int>($"/sync/tile/client/id");
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 617d97cfd4364314aa47cbd96de41f77
timeCreated: 1723433766

View File

@@ -0,0 +1,12 @@
using Plugins.JNGame.Network.Action;
namespace AppGame
{
public enum GActionEnum : int
{
//绑定客户端Id
BindClientID
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 75e48cb9a73a47ca8f5be63285d40309
timeCreated: 1723002055

View File

@@ -0,0 +1,28 @@
using UnityEngine;
using UnityEngine.SceneManagement;
namespace AppGame
{
public class Main : MonoBehaviour
{
public void SetClientEnv()
{
App.Env = AppEnv.Client;
SceneManager.LoadScene(1);
}
public void SetServerEnv()
{
App.Env = AppEnv.Server;
SceneManager.LoadScene(1);
}
public void SetServerClientEnv()
{
App.Env = AppEnv.ServerClient;
SceneManager.LoadScene(1);
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: eab418b967e6433a8cb655e981dec48b
timeCreated: 1723112402

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 6b8e69199e8f4057b15e5190d31d5e96
timeCreated: 1720606718

View File

@@ -0,0 +1,122 @@
using System;
using Cysharp.Threading.Tasks;
using DotRecast.Core.Collections;
using Game.Input;
using Game.JNGFrame.Logic;
using Game.JNGFrame.Logic.Entity;
using Game.JNGFrame.Logic.System;
using Game.JNGFrame.View;
using Game.JNGState.Logic.Data;
using JNGame.Sync.Entity;
using JNGame.Sync.Frame;
using JNGame.Sync.System;
using JNGame.Sync.System.Data;
using Plugins.JNGame.Network.Action;
using UnityEngine;
namespace AppGame.Sync
{
/// <summary>
/// 帧同步游戏
/// </summary>
public class JNGFrameSystem : JNSyncFrameService
{
public override SLogicSystem[] NewLogicSystems()
{
return new SLogicSystem[]
{
//基础数据
new DInputSystem(), //游戏输入
new DDataSystem(), //游戏数据
//帧同步逻辑层
new DMapSystem(), //游戏地图
new DWorldSystem(), //游戏逻辑
};
}
public override SDataSystemBase[] NewDataSystems()
{
return new SDataSystemBase[] {
new EDNodeDataSystem(SStateDataEnum.ServerClient), //游戏数据
};
}
public override SViewSystem[] NewViewSystems()
{
return new SViewSystem[]
{
//视图层
new DViewSystem(), //游戏视图
};
}
public override bool IsStartGame => true;
public override JNContexts CreateContexts()
{
return new EDContexts();
}
protected override void OnRunSimulate()
{
if (!(NFrameQueue.TryDequeue(out var frame))) return;
//插入当前输入
frame.Messages.ForEach(child =>
{
GetSystem<DInputSystem>().Enqueue(child);
});
Simulate();
}
/// <summary>
/// 获取输入
/// </summary>
/// <returns></returns>
protected override JNFrameInputs GetInputs()
{
return GetSystem<DInputSystem>().Dequeue();
}
/// <summary>
/// 发送输入
/// </summary>
/// <param name="inputs"></param>
protected override void OnSendInput(JNFrameInputs inputs)
{
//发送帧数据给服务端
App.Socket.Send((int)NActionEnum.NSyncFrameInput,inputs);
}
/// <summary>
/// 追帧
/// </summary>
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
protected override async UniTask<JNFrameInfos> OnServerData(int start, int end)
{
Debug.Log($"OnServerData - {start}");
try
{
var data = (await App.API.GetByte($"/sync/frame?start={start}"));
if (data is { Length: > 0 })
{
JNFrameInfos info = JNFrameInfos.Parser.ParseFrom(data);
Debug.Log($"OnServerData - {start} {end} 结束");
return info;
}
}
catch(Exception e)
{
// ignored
Debug.LogError(e.Message);
}
return new JNFrameInfos();
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: e596ac8b6f4144ba89fdd7ca984dd7f1
timeCreated: 1712663552

View File

@@ -0,0 +1,106 @@
using System.Collections.Generic;
using Game.Input;
using Game.JNGFrame.Logic;
using Game.JNGFrame.Logic.Entity;
using Game.JNGFrame.Logic.System;
using Game.JNGFrame.View;
using Game.JNGState.Logic.Data;
using Game.Logic.System;
using JNGame.Sync.Entity;
using JNGame.Sync.State;
using JNGame.Sync.System;
using JNGame.Sync.System.Data;
using Plugins.JNGame.Network.Action;
namespace AppGame.Sync
{
/// <summary>
/// 状态同步[服务器]
/// </summary>
public class JNGStateServerSystem : JNSStateServerService
{
protected List<JNFrameInput> Inputs = new();
public override SLogicSystem[] NewLogicSystems()
{
return new SLogicSystem[]
{
//基础数据
new DInputSystem(), //游戏输入
new DDataSystem(), //游戏数据
//逻辑层
new DMapSystem(), //游戏地图
new DWorldSystem(), //游戏逻辑
new DPlayerSystem(), //玩家逻辑
};
}
public override SDataSystemBase[] NewDataSystems()
{
return new SDataSystemBase[] {
new EDNodeDataSystem(SStateDataEnum.ServerClient), //游戏数据
new EDPlayerDataSystem(SStateDataEnum.ServerClient), //游戏数据
};
}
public override SViewSystem[] NewViewSystems()
{
return new SViewSystem[]
{
//视图层
new DViewSystem(), //游戏视图
};
}
public override JNContexts CreateContexts()
{
return new EDContexts();
}
protected override void OnRunSimulate()
{
//插入未处理输入
foreach (var input in Inputs)
{
GetSystem<DInputSystem>().Enqueue(input);
}
Inputs.Clear();
base.OnRunSimulate();
//发送输入
OnSendInput();
}
/// <summary>
/// 发送输入 (正常服务器是不需要发送输入的 这里用于测试)
/// </summary>
protected void OnSendInput()
{
var inputs = GetSystem<DInputSystem>().Dequeue();
if (inputs.Inputs.Count > 0)
{
//发送帧数据给服务端
App.Socket.Send((int)NActionEnum.NSyncFrameInput,inputs);
}
}
/// <summary>
/// 添加输入
/// </summary>
public void AddInput(JNFrameInfo info)
{
foreach (var input in info.Messages)
{
Inputs.Add(input);
}
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 0dbc5b160b164d41bb2138f2ed76ebb3
timeCreated: 1721811852

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 75baa1cf11cc44c2bb1e10fb46f74e50
timeCreated: 1722493271

View File

@@ -0,0 +1,199 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using AppGame.Systems;
using Game.Input;
using Game.JNGFrame.View;
using Game.JNGState.Logic.Data;
using JNGame.Math;
using JNGame.Sync.State.Tile;
using JNGame.Sync.System;
using JNGame.Sync.System.Data;
using JNGame.Util;
using Plugins.JNGame.Network.Action;
using UnityEngine;
namespace AppGame.Sync
{
public class JNGTileClientSystem : JNSSTileClientService
{
//区块Socket
public Dictionary<int, JNGClient> Sockets = new ();
//玩家位置
public LVector3? PlayerPos;
public override void Initialize()
{
base.Initialize();
//默认玩家位置
SetPlayerPosition(LVector3.Zero);
//定时更新Socket
Timers.Instance.SetInterval(1f, UpdateTileSocket);
}
protected override int[][] Tiles => new[]
{
new[] { 1, 2, 3 },
new[] { 4, 5, 6 },
new[] { 7, 8, 9 },
};
protected override int TileSize => 100;
public override SLogicSystem[] NewLogicSystems()
{
return new SLogicSystem[]
{
//基础数据
new DInputSystem(), //游戏输入
};
}
public override SDataSystemBase[] NewDataSystems()
{
return new SDataSystemBase[] {
new EDNodeDataSystem(SStateDataEnum.Client), //游戏数据
new EDPlayerDataSystem(SStateDataEnum.Client), //游戏数据
};
}
public override SViewSystem[] NewViewSystems()
{
return new SViewSystem[]
{
//视图层
new DViewSystem(), //游戏视图
};
}
protected override void OnRunSimulate()
{
//更新玩家位置
UpdatePlayerPosition();
base.OnRunSimulate();
//发送输入
OnSendInput();
}
/// <summary>
/// 发送输入 (正常服务器是不需要发送输入的 这里用于测试)
/// </summary>
private void OnSendInput()
{
var inputs = GetSystem<DInputSystem>().Dequeue();
if (inputs.Inputs.Count > 0)
{
//发送帧数据给服务端
JNStateTileInputs tileInputs = new JNStateTileInputs()
{
TId = 0,
Message = inputs
};
App.Client.Send((int)NActionEnum.NSyncTileInput,tileInputs);
}
}
/// <summary>
/// 设置玩家位置
/// </summary>
public void SetPlayerPosition(LVector3 pos)
{
PlayerPos = pos;
}
/// <summary>
/// 更新玩家位置
/// </summary>
public void UpdatePlayerPosition()
{
if (PlayerPos is null) return;
List<int> ids = GetTileGridIndex(PlayerPos.Value);
ids.ForEach(AddTileShow);
TileShow.ForEach(id =>
{
if (!(ids.Contains(id)))
{
RemoveTileShow(id);
}
});
}
/// <summary>
/// 更新区块Socket
/// </summary>
public void UpdateTileSocket()
{
TileShow.ForEach(index =>
{
if (!IsTileConnect(index))
{
AddSocket(index);
}
});
var keysToRemove = Sockets.Keys.Where(key => !TileShow.Contains(key)).ToList();
foreach (var key in keysToRemove)
{
RemoveSocket(key);
}
}
/// <summary>
/// 判断是否当前区块是否连接
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
public bool IsTileConnect(int index)
{
return Sockets.ContainsKey(index);
}
protected async Task AddSocket(int index)
{
if (IsTileConnect(index)) return;
var client = new JNGClient();
Sockets.Add(index,client);
//获取连接
var message = (await App.GAPI.NSyncTileServer(index));
TileServerInfo info = message.data;
if (info is not null)
{
client.SetPoint(new IPEndPoint(IPAddress.Parse(info.ip),info.port));
if (IsTileConnect(index))
{
App.Client.AddClient(client);
}
}
else
{
Sockets.Remove(index);
Debug.Log("获取连接失败");
}
}
protected void RemoveSocket(int index)
{
if (Sockets.TryGetValue(index,out var client))
{
App.Client.RemoveClient(client);
}
Sockets.Remove(index);
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: a158f1d590a642988611d229ddaa6a1c
timeCreated: 1722493289

View File

@@ -0,0 +1,225 @@
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using AppGame.Systems;
using Cysharp.Threading.Tasks;
using DotRecast.Core.Collections;
using Game.Input;
using Game.JNGFrame.Logic;
using Game.JNGFrame.Logic.Entity;
using Game.JNGFrame.Logic.System;
using Game.JNGFrame.View;
using Game.JNGState.Logic.Data;
using Game.Logic.System;
using JNGame.Sync.State.Tile;
using JNGame.Sync.State.Tile.Entity;
using JNGame.Sync.System;
using JNGame.Sync.System.Data;
using JNGame.Util;
using Plugins.JNGame.Network.Action;
using UnityEngine;
namespace AppGame.Sync
{
/// <summary>
/// 瓦片状态同步[服务器]
/// </summary>
public class JNGTileServerSystem : JNSSTileServerService
{
/// <summary>
/// 测试标识
/// </summary>
private static int TileId = 1;
protected List<JNFrameInput> Inputs = new();
//区块Socket
public Dictionary<int, JNGTileClient> Sockets = new ();
/// <summary>
/// 初始化服务器
/// </summary>
/// <returns></returns>
protected override async Task OnInit()
{
await base.OnInit();
//添加Tile服务器
App.Business.Send((int)NActionEnum.NAddTileServer,new JNAddTileServer()
{
Tile = TID,
Ip = "127.0.0.1",
Port = App.Server.Port
});
//定时更新Socket
Timers.Instance.SetInterval(1f, UpdateTileSocket);
}
public override SLogicSystem[] NewLogicSystems()
{
return new SLogicSystem[]
{
//基础数据
new DInputSystem(), //游戏输入
new DDataSystem(), //游戏数据
//逻辑层
new DMapSystem(), //游戏地图
new DWorldSystem(), //游戏逻辑
new DPlayerSystem(), //玩家逻辑
};
}
public override SDataSystemBase[] NewDataSystems()
{
return new SDataSystemBase[] {
new EDNodeDataSystem(SStateDataEnum.Server), //游戏数据
new EDPlayerDataSystem(SStateDataEnum.Server), //游戏数据
};
}
#if UNITY_EDITOR
/// <summary>
/// 编辑器显示视图层
/// </summary>
/// <returns></returns>
public override SViewSystem[] NewViewSystems()
{
return new SViewSystem[]
{
//视图层
new DViewSystem(), //游戏视图
};
}
#endif
protected override JNTileContexts CreateTileContexts()
{
return new EDContexts();
}
protected override int[][] Tiles => new[]
{
new[] { 1, 2, 3 },
new[] { 4, 5, 6 },
new[] { 7, 8, 9 },
};
protected override int TileSize => 100;
protected override async UniTask<int> FetchTileId()
{
// await UniTask.NextFrame();
// return TileId++;
var message = await App.GAPI.NSyncTileId;
return message.data;
}
protected override void OnRunSimulate()
{
//插入未处理输入
foreach (var input in Inputs)
{
GetSystem<DInputSystem>().Enqueue(input);
}
Inputs.Clear();
base.OnRunSimulate();
}
/// <summary>
/// 添加输入
/// </summary>
public void AddInput(JNStateTileInputs info)
{
lock (Inputs)
{
info.Message.Inputs.ForEach(child =>
{
Inputs.Add(child);
});
}
}
/// <summary>
/// 更新区块Socket
/// </summary>
public void UpdateTileSocket()
{
//获取周围TileId
List<int> grid = GetTileGridIndex(TID);
grid.Remove(TID);
grid.ForEach(index =>
{
if (!IsTileConnect(index))
{
AddSocket(index);
}
});
}
/// <summary>
/// 判断是否当前区块是否连接
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
public bool IsTileConnect(int index)
{
return Sockets.ContainsKey(index);
}
/// <summary>
/// 获取当前连接的区块列表
/// </summary>
/// <returns></returns>
public override int[] GetLinkTiles()
{
return Sockets.Keys.Where(key => Sockets[key].IsOpen).ToArray();
}
protected async Task AddSocket(int index)
{
if (IsTileConnect(index)) return;
var client = new JNGTileClient();
Sockets.Add(index,client);
//获取连接
var message = (await App.GAPI.NSyncTileServer(index));
TileServerInfo info = message.data;
if (info is not null)
{
client.SetPoint(new IPEndPoint(IPAddress.Parse(info.ip),info.port));
await client.OnInit();
}
else
{
Sockets.Remove(index);
Debug.Log("获取连接失败");
}
}
protected void RemoveSocket(int index)
{
if (Sockets.TryGetValue(index,out var client))
{
client.OnClose();
}
Sockets.Remove(index);
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 34430b78df32409ea2142a49f0e36683
timeCreated: 1722241862

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: adb805196eb84a23aa21c4c66c48a2ee
timeCreated: 1721384419

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 2a1ee7e98b494ccfadfd9ee103715117
timeCreated: 1723691610

View File

@@ -0,0 +1,42 @@
using System.Net;
using System.Threading.Tasks;
using Cysharp.Threading.Tasks;
using Plugins.JNGame.Network;
using Plugins.JNGame.Network.Action;
namespace AppGame.Systems
{
public class JNGClient : JNTCPClient
{
private IPEndPoint _point;
public void SetPoint(IPEndPoint point)
{
_point = point;
}
protected override async UniTask<IPEndPoint> GetEndPoint()
{
await UniTask.NextFrame();
return _point;
}
public override async Task OnInit()
{
//监听服务端事件
AddListener((int)NActionEnum.NSyncStateDataUpdate,OnNSyncStateDataUpdate);
//连接
await base.OnInit();
}
private void OnNSyncStateDataUpdate(byte[] data)
{
var info = JNStateItemData.Parser.ParseFrom(data);
App.Game.AddState(info);
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: de07e6b56137456fb6464195f9e1941d
timeCreated: 1722426114

View File

@@ -0,0 +1,30 @@
using System.Threading.Tasks;
using Plugins.JNGame.Network.Group;
namespace AppGame.Systems
{
public class JNGClientGroup : JNClientGroup<JNGClient>
{
//玩家Id
private int clientId;
public int ClientID => clientId;
public override async Task OnInit()
{
clientId = (await App.GAPI.NSyncTileClientId).data;
await base.OnInit();
}
public override void AddClient(JNGClient client)
{
base.AddClient(client);
//向服务器发送玩家Id
client.Send((int)GActionEnum.BindClientID,new RClientIDMessage()
{
ClientId = clientId
});
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: b74afb48ac594bbd8db4d8323f8c2b7f
timeCreated: 1723451509

View File

@@ -0,0 +1,91 @@
using System;
using System.Collections.Generic;
using System.Net.Sockets;
using System.Threading.Tasks;
using Cysharp.Threading.Tasks;
using DotRecast.Core.Collections;
using JNGame.Network;
using Plugins.JNGame.Network;
using Plugins.JNGame.Network.Action;
namespace AppGame.Systems
{
public class JNGServer : JNTCPServer
{
private int _index = 1;
private bool isInit = false;
//客户端绑定的Id
private Dictionary<int, int> ids = new();
public override async Task OnInit()
{
if (isInit) return;
isInit = true;
//监听服务端事件
AddListener((int)NActionEnum.NSyncFrameInput,OnNSyncFrameInput);
AddListener((int)NActionEnum.NSyncTileInput,OnNSyncTileInput);
AddListener((int)GActionEnum.BindClientID,OnBindClientID);
//连接
await base.OnInit();
}
public override void OnClose()
{
isInit = false;
base.OnClose();
}
protected override async UniTask<int> GetPort()
{
return (await App.GAPI.NSyncTilePort).data;
}
/// <summary>
/// 绑定客户端Id
/// </summary>
/// <param name="obj"></param>
/// <exception cref="NotImplementedException"></exception>
private void OnBindClientID(JNServerParam args)
{
var message = RClientIDMessage.Parser.ParseFrom(args.Message);
ids[args.Client] = message.ClientId;
}
/// <summary>
/// 接收帧数入
/// </summary>
/// <param name="args"></param>
private void OnNSyncFrameInput(JNServerParam args)
{
var inputs = JNFrameInputs.Parser.ParseFrom(args.Message);
var frame = new JNFrameInfo();
frame.Index = 0;
foreach (var input in inputs.Inputs)
{
frame.Messages.Add(input);
}
App.Game.AddInput(frame);
}
/// <summary>
/// 接收瓦片输入
/// </summary>
/// <param name="args"></param>
private void OnNSyncTileInput(JNServerParam args)
{
var inputs = JNStateTileInputs.Parser.ParseFrom(args.Message);
//只有绑定过ID 的客户端才可以执行操作
inputs.Message.Inputs.ForEach(child =>
{
child.ClientId = args.Client;
});
App.Game.AddTileInput(inputs);
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4d29d51922a6446490e06c87636d2590
timeCreated: 1722426103

View File

@@ -0,0 +1,43 @@
using System.Net;
using System.Threading.Tasks;
using Cysharp.Threading.Tasks;
using Plugins.JNGame.Network;
using Plugins.JNGame.Network.Action;
namespace AppGame.Systems
{
public class JNGTileClient : JNTCPClient
{
private IPEndPoint _point;
public void SetPoint(IPEndPoint point)
{
_point = point;
}
protected override async UniTask<IPEndPoint> GetEndPoint()
{
await UniTask.NextFrame();
return _point;
}
public override async Task OnInit()
{
//监听服务端事件
AddListener((int)NActionEnum.NSyncStateDataUpdate,OnNSyncStateDataUpdate);
//连接
await base.OnInit();
}
private void OnNSyncStateDataUpdate(byte[] data)
{
var info = JNStateItemData.Parser.ParseFrom(data);
App.Game.AddState(info);
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 892255e4a0a4489784ba78fef9492936
timeCreated: 1723691588

View File

@@ -0,0 +1,135 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using AppGame.Sync;
using JNGame.Sync.Frame;
using JNGame.Sync.State;
using JNGame.Sync.System.Data;
using JNGame.Sync.System.View;
using Plugins.JNGame.System;
namespace AppGame.Systems
{
public class JNGGame : SystemBase
{
/// <summary>
/// 同步组
/// </summary>
private List<JNSyncDefaultService> syncs = new();
private JNSyncDefaultService client;
private List<JNSStateServerService> servers = new();
public bool IsStartGame => syncs.Count > 0 && syncs[0].IsStartGame;
public override async Task OnInit()
{
}
/// <summary>
/// 运行一个同步类
/// </summary>
public T Start<T>() where T : JNSyncDefaultService,new()
{
syncs.Add(new T());
syncs[^1].Initialize();
if (syncs[^1] is JNSStateServerService server)
{
servers.Add(server);
}
else
{
client = syncs[^1];
}
return syncs[^1] as T;
}
/// <summary>
/// 更新周期
/// </summary>
public void Update()
{
foreach (var sync in syncs)
{
sync.Execute();
}
}
/// <summary>
/// 获取第一个客户端的输入类
/// </summary>
/// <typeparam name="T"></typeparam>
/// <returns></returns>
public T GetInput<T>() where T : JNInputBase, new()
{
return GetClient().GetSystem<JNInputSystem>().Input<T>();
}
/// <summary>
/// 获取第一个客户端
/// </summary>
/// <returns></returns>
public JNSyncDefaultService GetClient()
{
return client;
}
public T GetClient<T>() where T : JNSyncDefaultService
{
return (T)client;
}
/// <summary>
/// 接收输入数据
/// </summary>
/// <param name="frame"></param>
public void AddInput(JNFrameInfo frame)
{
foreach (var sync in syncs)
{
(sync as JNGFrameSystem)?.AddFrame(frame);
(sync as JNGStateServerSystem)?.AddInput(frame);
}
}
public void AddTileInput(JNStateTileInputs frame)
{
foreach (var sync in syncs)
{
if (sync is JNGTileServerSystem system)
{
if (system.TID == frame.TId || frame.TId == 0)
{
system.AddInput(frame);
}
}
}
}
/// <summary>
/// 接收状态数据
/// </summary>
/// <param name="frame"></param>
public void AddState(JNStateItemData frame)
{
var message = new Dictionary<long, byte[]>();
foreach (var data in frame.Messages)
{
message.Add(data.Key,data.Value.Data.ToByteArray());
}
foreach (var sync in syncs)
{
sync.GetSystems<ISStateDataSystem>().ForEach(child =>
{
if (child.NetID != frame.NetID) return;
child.OnInsertUBytes(message);
});
}
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: bf6b9c1fec19438fa9b636bc2e7e4df1
timeCreated: 1722495304

View File

@@ -0,0 +1,12 @@

using Cysharp.Threading.Tasks;
using Plugins.JNGame.Network;
public class JNGSocket : JNSocket
{
protected override async UniTask<string> GetUrl()
{
await UniTask.NextFrame();
return "ws://127.0.0.1:8080/websocket";
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: aa09b61b047f4c98bd0b5e3dc2fad6aa
timeCreated: 1721384427

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4d48cd18f97a4ba6b097724374ed4710
timeCreated: 1715242594

View File

@@ -0,0 +1,42 @@
using JNGame.PathFinding;
using UnityEngine;
namespace Lockstep.Game
{
/// <summary>
/// 地图调试可视化
/// </summary>
public class MapVisualize : MonoBehaviour
{
#if UNITY_EDITOR
public bool isDrawMap;
public void DebugVisualize()
{
// if (GSystem.Root == null) { return; }
// var Map = GSystem.Root.GetService<DemoMapService>()?.Map;
//
// if (Map is not null)
// {
// BspTree.s_DebugMat = Resources.Load<Material>("WhiteMat");
// BspTree.s_DebugTrans = gameObject.transform;
// Map.DebugVisualize();
// }
}
private void OnDrawGizmos()
{
// if (GSystem.Root == null) { return; }
// var Map = GSystem.Root.GetService<DemoMapService>()?.Map;
//
// if (Map is not null && isDrawMap)
// {
// // 绘制地图
// Map.DrawGizmos();
// }
}
#endif
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 79b9341e6e6b4b3da75d6f4383242e1d
timeCreated: 1715242605

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 583229ce882543bf92f0ed6cd2368bbc
timeCreated: 1712664620

View File

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

View File

@@ -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));
}
}
}

View File

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

View File

@@ -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);
}
}
}

View File

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

View File

@@ -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;
}
}
}

View File

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

View File

@@ -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;
}
}
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -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);
}
}
}

View File

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

View File

@@ -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;
}
}

View File

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

View File

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

View File

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

View File

@@ -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;
}
}

View File

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

View File

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

View File

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

View File

@@ -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() };
}
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -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();
}
}
}

View File

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

View File

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

View File

@@ -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());
}
}
}

View File

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

View File

@@ -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));
}
}
}

View File

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

View File

@@ -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));
}
}
}

View File

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

View File

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

View File

@@ -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;
}
}
}

View File

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

View File

@@ -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;
}
}
}

View File

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

View File

@@ -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();
}
}
}

View File

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

View File

@@ -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();
}
}
}

View File

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

View File

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

View File

@@ -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;
}
}
}

View File

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

View File

@@ -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;
}
}
}

View File

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

View File

@@ -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);
}
}
}

View File

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

View File

@@ -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);
}
});
}
}
}

View File

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

View File

@@ -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);
}
}
}
}

View File

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

View File

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

View File

@@ -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();
// }
// }
}
}

View File

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

View File

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

View File

@@ -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);
}
}
}

Some files were not shown because too many files have changed in this diff Show More