Test_Project_Cocos/JisolGame
1
0
Fork 0
mirror of https://gitee.com/jisol/jisol-game/ synced 2025-09-26 18:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

提交无缝数据回滚

Browse Source
This commit is contained in:
PC-20230316NUNE\Administrator
2024-08-23 10:48:19 +08:00
parent 8932528f5e
commit 77db4d7d71
23 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
JNFrame2/Assets/JNGame/Map/DotRecast/DotRecastRoot.cs
View File

@@ -23,11 +23,11 @@ namespace JNGame.Map.DotRecast
//智能体避障
public DtCrowd Crowd { private set; get; }
private Dictionary<long, DtCrowdAgent> agents;
private Dictionary<ulong, DtCrowdAgent> agents;
public DotRecastRoot(MeshData data)
{
agents = new Dictionary<long, DtCrowdAgent>();
agents = new Dictionary<ulong, DtCrowdAgent>();
//初始化导航数据
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];
}

10
JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs
View File

@@ -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<JNStateItemData>
/// <summary>Field number for the "messages" field.</summary>
public const int MessagesFieldNumber = 2;
private static readonly pbc::MapField<long, global::JNStateData>.Codec _map_messages_codec
= new pbc::MapField<long, global::JNStateData>.Codec(pb::FieldCodec.ForInt64(8, 0L), pb::FieldCodec.ForMessage(18, global::JNStateData.Parser), 18);
private readonly pbc::MapField<long, global::JNStateData> messages_ = new pbc::MapField<long, global::JNStateData>();
private static readonly pbc::MapField<ulong, global::JNStateData>.Codec _map_messages_codec
= new pbc::MapField<ulong, global::JNStateData>.Codec(pb::FieldCodec.ForUInt64(8, 0UL), pb::FieldCodec.ForMessage(18, global::JNStateData.Parser), 18);
private readonly pbc::MapField<ulong, global::JNStateData> messages_ = new pbc::MapField<ulong, global::JNStateData>();
/// <summary>
///状态bytes
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public pbc::MapField<long, global::JNStateData> Messages {
public pbc::MapField<ulong, global::JNStateData> Messages {
get { return messages_; }
}

2
JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto
View File

@@ -49,7 +49,7 @@ message JNStateData{
// 更新状态
message JNStateItemData{
int32 NetID = 1; //同步Id
map<int64 ,JNStateData> messages = 2; //状态bytes
map<uint64 ,JNStateData> messages = 2; //状态bytes
}
// 全量状态

2
JNFrame2/Assets/JNGame/Sync/App/Tile/Entity/JNTileContext.cs
View File

@@ -43,7 +43,7 @@ namespace JNGame.Sync.State.Tile.Entity
}
}
public T TileSyncCreate(long id)
public T TileSyncCreate(ulong id)
{
//判断是否有这个Id实体

7
JNFrame2/Assets/JNGame/Sync/App/Tile/JNSSTileServerService.cs
View File

@@ -32,6 +32,11 @@ namespace JNGame.Sync.State.Tile
/// </summary>
public int TID { get; private set; }
/// <summary>
/// 随机数大小(100000000000UL * RandomSize)
/// </summary>
public int RandomSize { get; protected set; } = 1;
/// <summary>
/// 区块最大最小位置
/// </summary>
@@ -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;
}

10
JNFrame2/Assets/JNGame/Sync/Entity/JNEntity.cs
View File

@@ -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
/// </summary>
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<JNRandomSystem>().NextId();
}
else
{
GetSystem<JNRandomSystem>().AdaptId(id);
}
}
public abstract JNEntityLookup NewCLookup();

2
JNFrame2/Assets/JNGame/Sync/IJNSyncId.cs
View File

@@ -3,7 +3,7 @@
public interface IJNSyncId
{
public long Id { get; }
public ulong Id { get; }
}
}

20
JNFrame2/Assets/JNGame/Sync/System/Data/SStateDataSystem.cs
View File

@@ -45,12 +45,12 @@ namespace JNGame.Sync.System.Data
/// <summary>
/// 插入字节
/// </summary>
public void OnInsertUBytes(Dictionary<long, byte[]> bytes);
public void OnInsertUBytes(Dictionary<ulong, byte[]> bytes);
/// <summary>
/// 获取全部字节
/// </summary>
public Dictionary<long, byte[]> GetDataBytes();
public Dictionary<ulong, byte[]> GetDataBytes();
}
@@ -64,7 +64,7 @@ namespace JNGame.Sync.System.Data
public abstract int NetID { get; }
//网络通讯的更新字节数据
protected Dictionary<long, byte[]> UBytes = new();
protected Dictionary<ulong, byte[]> UBytes = new();
public SStateDataEnum Type;
@@ -117,13 +117,13 @@ namespace JNGame.Sync.System.Data
/// </summary>
/// <param name="bytes"></param>
/// <returns>是否清空UBytes</returns>
public abstract void OnSendUBytes(Dictionary<long, byte[]> bytes);
public abstract void OnSendUBytes(Dictionary<ulong, byte[]> bytes);
/// <summary>
/// 插入字节
/// </summary>
/// <returns></returns>
public void OnInsertUBytes(Dictionary<long, byte[]> bytes)
public void OnInsertUBytes(Dictionary<ulong, byte[]> bytes)
{
//提交数据更新
OnUByteUpdate(bytes);
@@ -132,9 +132,9 @@ namespace JNGame.Sync.System.Data
/// <summary>
/// 获取全部字节
/// </summary>
public Dictionary<long, byte[]> GetDataBytes()
public Dictionary<ulong, byte[]> GetDataBytes()
{
var data = new Dictionary<long, byte[]>();
var data = new Dictionary<ulong, byte[]>();
lock (Data)
{
@@ -153,7 +153,7 @@ namespace JNGame.Sync.System.Data
/// <summary>
/// 将UByte提交更新
/// </summary>
public virtual void OnUByteUpdate(Dictionary<long, byte[]> bytes)
public virtual void OnUByteUpdate(Dictionary<ulong, byte[]> bytes)
{
lock (Data)
{
@@ -187,7 +187,7 @@ namespace JNGame.Sync.System.Data
/// <param name="id"></param>
/// <param name="bytes"></param>
/// <returns></returns>
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
/// <summary>
/// 删除数据
/// </summary>
public virtual void Delete(long id)
public virtual void Delete(ulong id)
{
UBytes[id] = SDByteOperate.DELETE;
}

20
JNFrame2/Assets/JNGame/Sync/System/Data/STileDataSystem.cs
View File

@@ -21,13 +21,13 @@ namespace JNGame.Sync.System.Data
/// <summary>
/// 获取有权限的全部字节
/// </summary>
public Dictionary<long, byte[]> GetHostDataBytes();
public Dictionary<ulong, byte[]> GetHostDataBytes();
/// <summary>
/// 获取指定区块的全部字节
/// </summary>
public Dictionary<long, byte[]> GetTileDataBytes(int index);
public Dictionary<ulong, byte[]> GetTileDataBytes(int index);
@@ -68,7 +68,7 @@ namespace JNGame.Sync.System.Data
{
}
public override void OnUByteUpdate(Dictionary<long, byte[]> bytes)
public override void OnUByteUpdate(Dictionary<ulong, byte[]> bytes)
{
base.OnUByteUpdate(bytes);
if (isServer)
@@ -83,11 +83,11 @@ namespace JNGame.Sync.System.Data
protected virtual void OnDataSyncContext()
{
Dictionary<long, T> lIsTileData;
Dictionary<ulong, T> lIsTileData;
lock (Data)
{
lIsTileData = new Dictionary<long, T>(Data);
lIsTileData = new Dictionary<ulong, T>(Data);
}
NodeContext.GetEntities().ForEach(child =>
@@ -155,7 +155,7 @@ namespace JNGame.Sync.System.Data
{
//需要删除的数据Id
var ids = new List<long>();
var ids = new List<ulong>();
Data.ForEach(child =>
{
@@ -175,10 +175,10 @@ namespace JNGame.Sync.System.Data
}
public Dictionary<long, byte[]> GetHostDataBytes()
public Dictionary<ulong, byte[]> GetHostDataBytes()
{
var data = new Dictionary<long, byte[]>();
var data = new Dictionary<ulong, byte[]>();
lock (Data)
{
@@ -195,10 +195,10 @@ namespace JNGame.Sync.System.Data
}
public Dictionary<long, byte[]> GetTileDataBytes(int index)
public Dictionary<ulong, byte[]> GetTileDataBytes(int index)
{
var data = new Dictionary<long, byte[]>();
var data = new Dictionary<ulong, byte[]>();
lock (Data)
{

26
JNFrame2/Assets/JNGame/Sync/System/Logic/JNRandomSystem.cs
View File

@@ -16,9 +16,9 @@ namespace JNGame.Sync.Frame.Service
private Func<int,int,int> 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;
}
/// <summary>
/// 适配Id 用于 历史Id和新Id重复问题
/// </summary>
/// <param name="id"></param>
/// <exception cref="NotImplementedException"></exception>
public void AdaptId(long id)
{
if (_idMin <= id && id >= _idMax)
{
if (id > _id)
{
_id = id;
}
}
}
}
}

8
JNFrame2/Assets/JNGame/Sync/System/SDataSystem.cs
View File

@@ -26,7 +26,7 @@ namespace JNGame.Sync.System
/// <summary>
/// 数据唯一Id
/// </summary>
public long Id { get; set; }
public ulong Id { get; set; }
/// <summary>
/// 判断是否一样
@@ -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<JNRandomSystem>();
//数据集
public Dictionary<long, T> Data = new();
public Dictionary<ulong, T> Data = new();
public virtual T[] Datas {
get
@@ -80,7 +80,7 @@ namespace JNGame.Sync.System
/// <summary>
/// 返回最新数据 (收集最新的ISData数据 正常来讲只有服务端会运行)
/// </summary>
public virtual Dictionary<long, T> GetLatest()
public virtual Dictionary<ulong, T> GetLatest()
{
return new ();
}

4
JNFrame2/Assets/JNGame/Sync/System/SLogicSystem.cs
View File

@@ -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()
{

4
JNFrame2/Assets/JNGame/Sync/View/ViewData.cs
View File

@@ -17,7 +17,7 @@ namespace JNGame.Sync.View
public abstract class ViewData<T> : IViewData where T : ISData
{
private Dictionary<long, ViewGameObject> views = new();
private Dictionary<ulong, ViewGameObject> views = new();
private SViewSystem root;
public SViewSystem Root => root;
@@ -53,7 +53,7 @@ namespace JNGame.Sync.View
if (isRest)
{
List<long> deletes = new List<long>();
List<ulong> deletes = new List<ulong>();
foreach (var child in views)
{
if (child.Value.Update != Update)

1
JNFrame2/Assets/Scripts/AppGame/GAPI.cs
View File

@@ -20,6 +20,7 @@ namespace AppGame
//获取ID
public UniTask<NewsContext<int>> NSyncTileId = App.API.GetNews<int>($"/sync/tile/id");
public UniTask<NewsContext<int>> NSyncTileRandomId = App.API.GetNews<int>($"/sync/tile/random/id");
//获取端口
public UniTask<NewsContext<int>> NSyncTilePort = App.API.GetNews<int>($"/sync/tile/port");
//获取默认连接

4
JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileServerSystem.cs
View File

@@ -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<long, byte[]>();
var message = new Dictionary<ulong, byte[]>();
tileInfo.Data.Data.ForEach(frame =>
{
message.Clear();

2
JNFrame2/Assets/Scripts/AppGame/Systems/JNGGame.cs
View File

@@ -115,7 +115,7 @@ namespace AppGame.Systems
/// </summary>
public void AddState(JNStateItemData frame)
{
var message = new Dictionary<long, byte[]>();
var message = new Dictionary<ulong, byte[]>();
foreach (var data in frame.Messages)
{
message.Add(data.Key,data.Value.Data.ToByteArray());

4
JNFrame2/Assets/Scripts/Game/Data/EDNodeDataSystem.cs
View File

@@ -45,9 +45,9 @@ namespace Game.JNGState.Logic.Data
public override int NetID => (int)NetDataEnum.EDNodeData;
public override Dictionary<long, EDNodeData> GetLatest()
public override Dictionary<ulong, EDNodeData> GetLatest()
{
var nodes = new Dictionary<long, EDNodeData>();
var nodes = new Dictionary<ulong, EDNodeData>();
NodeContext.GetEntities().ForEach(child =>
{
if (nodes.ContainsKey(child.Id))

4
JNFrame2/Assets/Scripts/Game/Data/EDPlayerDataSystem.cs
View File

@@ -70,9 +70,9 @@ namespace Game.JNGState.Logic.Data
public override JNTileContext<EDPlayer> NodeContext => Contexts.GetContext<EDPlayerContext>();
public override Dictionary<long, EDPlayerData> GetLatest()
public override Dictionary<ulong, EDPlayerData> GetLatest()
{
var nodes = new Dictionary<long, EDPlayerData>();
var nodes = new Dictionary<ulong, EDPlayerData>();
NodeContext.GetEntities().ForEach(child =>
{
nodes.Add(child.Id,new EDPlayerData(child));

2
JNFrame2/Assets/Scripts/Game/Data/GDataBaseSystem.cs
View File

@@ -110,7 +110,7 @@ namespace Game.JNGState.Logic.Data
{
}
public override void OnSendUBytes(Dictionary<long, byte[]> bytes)
public override void OnSendUBytes(Dictionary<ulong, byte[]> bytes)
{
JNStateItemData data = new JNStateItemData();

12
JNFrame2/Assets/Scripts/Game/Logic/System/DMapSystem.cs
View File

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