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

修复主从交互bug

Browse Source
This commit is contained in:
DESKTOP-5RP3AKU\Jisol
2024-09-23 03:50:27 +08:00
parent ca64b708ac
commit b65b860b98
55 changed files with 233 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JNFrame2/Assets/Scripts/AppGame/App.cs
View File

@@ -35,7 +35,6 @@ namespace AppGame
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 readonly EventDispatcher Event = new();
@@ -50,7 +49,6 @@ namespace AppGame
Client,
Resource,
Game,
// Socket,
};
}

2
JNFrame2/Assets/Scripts/AppGame/Sync/JNGFrameSystem.cs
View File

@@ -89,7 +89,7 @@ namespace AppGame.Sync
protected override void OnSendInput(JNFrameInputs inputs)
{
//发送帧数据给服务端
App.Socket.Send((int)NActionEnum.NSyncFrameInput,inputs);
App.Business.Send((int)NActionEnum.NSyncFrameInput,inputs);
}
/// <summary>

2
JNFrame2/Assets/Scripts/AppGame/Sync/JNGStateServerSystem.cs
View File

@@ -89,7 +89,7 @@ namespace AppGame.Sync
if (inputs.Inputs.Count > 0)
{
//发送帧数据给服务端
App.Socket.Send((int)NActionEnum.NSyncFrameInput,inputs);
App.Business.Send((int)NActionEnum.NSyncFrameInput,inputs);
}
}

4
JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGClient.cs
View File

@@ -74,7 +74,7 @@ namespace AppGame.Systems
private void OnNSyncStateDataUpdate(byte[] data)
{
var info = JNStateItemData.Parser.ParseFrom(data);
App.Game.AddState(info);
App.Game.SyncState(info,true,false);
}
@@ -92,7 +92,7 @@ namespace AppGame.Systems
//生效全局回调
allData.Data.Data.ForEach(child =>
{
App.Game.AddState(child);
App.Game.SyncState(child,true,false);
});
}

21
JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGServer.cs
View File

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
using AppGame.Sync;
using Cysharp.Threading.Tasks;
using DotRecast.Core.Collections;
using Game.Logic.System;
using Google.Protobuf;
using JNGame.Network;
using JNGame.Sync.State.Tile;
@@ -31,6 +32,7 @@ namespace AppGame.Systems.CServer
AddListener((int)NActionEnum.NSyncTileInput,OnNSyncTileInput);
AddListener((int)NActionEnum.NSyncTileAllUpdate,OnNSyncTileAllUpdate);
AddListener((int)NActionEnum.NSyncTileGetTileInfo,OnNSyncTileGetTileInfo);
AddListener((int)NActionEnum.LocalClientDisconnect,OnLocalClientDisconnect);
OnInit_Game();
@@ -38,6 +40,7 @@ namespace AppGame.Systems.CServer
await base.OnInit();
}
public override void OnClose()
{
isInit = false;
@@ -165,5 +168,23 @@ namespace AppGame.Systems.CServer
}
/// <summary>
/// 有客户端断开连接
/// </summary>
private void OnLocalClientDisconnect(JNServerParam args)
{
if (App.Game.Server is null) return;
//只有绑定过ID 的客户端才可以执行操作
if (!ids.ContainsKey(args.Client)) return;
App.Game.Server.GetSystems<DGBasisSystem>().ForEach(child =>
{
child.OnPlayerExitServer(ids[args.Client]);
});
}
}
}

4
JNFrame2/Assets/Scripts/AppGame/Systems/CServer/JNGTileClient.cs
View File

@@ -74,7 +74,7 @@ namespace AppGame.Systems
private void OnNSyncStateDataUpdate(byte[] data)
{
var info = JNStateItemData.Parser.ParseFrom(data);
App.Game.AddState(info);
App.Game.SyncState(info,false,true);
}
/// <summary>
@@ -91,7 +91,7 @@ namespace AppGame.Systems
//生效全局状态
allData.Data.Data.ForEach(child =>
{
App.Game.AddState(child);
App.Game.SyncState(child,false,true);
});
}

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

@@ -112,24 +112,30 @@ namespace AppGame.Systems
/// <summary>
/// 接收状态数据
/// </summary>
public void AddState(JNStateItemData frame)
public void SyncState(JNStateItemData frame,bool isSyncClient,bool isSyncServer)
{
var message = new Dictionary<ulong, byte[]>();
foreach (var data in frame.Messages)
{
message.Add(data.Key,data.Value.Data.ToByteArray());
}
client?.GetSystems<ISStateDataSystem>().ForEach(child =>
if (isSyncClient)
{
if (child.NetID != frame.NetID) return;
child.OnInsertUBytes(message);
});
server?.GetSystems<ISStateDataSystem>().ForEach(child =>
client?.GetSystems<ISStateDataSystem>().ForEach(child =>
{
if (child.NetID != frame.NetID) return;
child.OnInsertUBytes(message);
});
}
if (isSyncServer)
{
if (child.NetID != frame.NetID) return;
child.OnInsertUBytes(message);
});
server?.GetSystems<ISStateDataSystem>().ForEach(child =>
{
if (child.NetID != frame.NetID) return;
child.OnInsertUBytes(message);
});
}
}
}