Test_Project_Cocos/JisolGame
1
0
Fork 0
mirror of https://gitee.com/jisol/jisol-game/ synced 2025-11-11 08:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

提交新概念 Tile从服务器

Browse Source
This commit is contained in:
PC-20230316NUNE\Administrator
2024-08-31 15:35:12 +08:00
parent 77db4d7d71
commit d67032e1de
1039 changed files with 57738 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,9 +4,10 @@ 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.Logic;
using Game.Logic.System.Usual;
using JNGame.Sync.Entity;
using JNGame.Sync.Frame;
using JNGame.Sync.System;

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

@@ -2,10 +2,11 @@
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 Game.Logic.System.Logic;
using Game.Logic.System.Usual;
using JNGame.Sync.Entity;
using JNGame.Sync.State;
using JNGame.Sync.System;
@@ -35,6 +36,7 @@ namespace AppGame.Sync
new DMapSystem(), //游戏地图
new DWorldSystem(), //游戏逻辑
new DPlayerSystem(), //玩家逻辑
new DBossSystem(), //Boss逻辑
};
}

38
JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileClientSystem.cs
View File

@@ -23,8 +23,9 @@ namespace AppGame.Sync
//区块Socket
public Dictionary<int, JNGClient> Sockets = new ();
//玩家位置
//玩家位置 和 区块
public LVector3? PlayerPos;
public int? PlayerTile;
public override void Initialize()
{
@@ -64,6 +65,7 @@ namespace AppGame.Sync
return new SDataSystemBase[] {
new EDNodeDataSystem(SStateDataEnum.Client), //游戏数据
new EDPlayerDataSystem(SStateDataEnum.Client), //游戏数据
new EDBossDataSystem(SStateDataEnum.Client), //游戏数据
};
}
@@ -111,6 +113,12 @@ namespace AppGame.Sync
public void SetPlayerPosition(LVector3 pos)
{
PlayerPos = pos;
int index = GetTileIndex(pos);
if (PlayerTile != index)
{
PlayerTile = index;
App.Event.Dispatch(GEvent.GSwPlayerTile);
}
}
/// <summary>
@@ -148,7 +156,7 @@ namespace AppGame.Sync
});
var keysToRemove = Sockets.Keys.Where(key => !TileShow.Contains(key)).ToList();
foreach (var key in keysToRemove)
{
{
RemoveSocket(key);
}
}
@@ -163,7 +171,7 @@ namespace AppGame.Sync
return Sockets.ContainsKey(index);
}
protected async Task AddSocket(int index)
protected async Task AddSocket(int index,TileServerInfo info = null)
{
if (IsTileConnect(index)) return;
@@ -171,8 +179,12 @@ namespace AppGame.Sync
Sockets.Add(index,client);
//获取连接
var message = (await App.GAPI.NSyncTileServer(index));
TileServerInfo info = message.data;
if (info is null)
{
var message = (await App.GAPI.NSyncTileServer(index));
info = message.data;
}
if (info is not null)
{
client.SetPoint($"{info.ip}:{info.port}");
@@ -191,19 +203,25 @@ namespace AppGame.Sync
}
public async Task SwSocket(int index,TileServerInfo info)
{
RemoveSocket(index);
await AddSocket(index, info);
}
protected void RemoveSocket(int index)
{
if (Sockets.TryGetValue(index,out var client))
{
Debug.Log($"[{index}] 卸载 Socket");
App.Client.RemoveClient(client);
//并且释放数据
GetSystems<ISTileDataSystem>().ForEach(data =>
{
data.ClearTileData(index);
});
}
Sockets.Remove(index);
//并且释放数据
GetSystems<ISTileDataSystem>().ForEach(data =>
{
data.ClearTileData(index);
});
}
public void RemoveSocket(string server)
{

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

@@ -1,18 +1,18 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using AppGame.Systems;
using AppGame.Systems.CServer;
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 Game.Logic.System.Logic;
using Game.Logic.System.Usual;
using JNGame.Sync.State.Tile;
using JNGame.Sync.State.Tile.Entity;
using JNGame.Sync.System;
@@ -28,11 +28,6 @@ namespace AppGame.Sync
/// </summary>
public class JNGTileServerSystem : JNSSTileServerService
{
/// <summary>
/// 测试标识
/// </summary>
private static int TileId = 1;
protected List<JNFrameInput> Inputs = new();
@@ -41,6 +36,8 @@ namespace AppGame.Sync
//是否开始前尝试连接周围区块去恢复历史数据
public bool isRecover = true;
public override TileMasterSlaveEnum MSRole => TileMasterSlaveEnum.Master;
/// <summary>
/// 初始化服务器
@@ -100,7 +97,8 @@ namespace AppGame.Sync
{
Tile = TID,
Ip = "127.0.0.1",
Port = App.Server.Port
Port = App.Server.Port,
Master = true
});
//定时更新Socket
@@ -121,6 +119,7 @@ namespace AppGame.Sync
new DMapSystem(), //游戏地图
new DWorldSystem(), //游戏逻辑
new DPlayerSystem(), //玩家逻辑
new DBossSystem(), //Boss逻辑
};
}
@@ -128,8 +127,9 @@ namespace AppGame.Sync
public override SDataSystemBase[] NewDataSystems()
{
return new SDataSystemBase[] {
new EDNodeDataSystem(SStateDataEnum.Server), //游戏数据
new EDPlayerDataSystem(SStateDataEnum.Server), //游戏数据
new EDNodeDataSystem(SStateDataEnum.Server), //游戏数据
new EDPlayerDataSystem(SStateDataEnum.Server), //游戏数据
new EDBossDataSystem(SStateDataEnum.Server), //游戏数据
};
}
@@ -253,6 +253,7 @@ namespace AppGame.Sync
if (info is not null)
{
Debug.Log($"[{index}] 连接 Socket");
client.SetRole(JNGClientRole.Player);
client.SetPoint($"{info.ip}:{info.port}");
client.SetTileServer(info.server);
await client.OnInit();

202
JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileSlaveServerSystem.cs Normal file
View File

@@ -0,0 +1,202 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using AppGame.Systems;
using AppGame.Systems.CServer;
using Cysharp.Threading.Tasks;
using DotRecast.Core.Collections;
using Game.Input;
using Game.JNGFrame.Logic;
using Game.JNGFrame.Logic.Entity;
using Game.JNGFrame.View;
using Game.JNGState.Logic.Data;
using Game.Logic.System;
using Game.Logic.System.Logic;
using Game.Logic.System.Usual;
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 JNGTileSlaveServerSystem : JNSSTileServerService
{
protected List<JNFrameInput> Inputs = new();
protected override int[][] Tiles => new[]
{
new[] { 1, 2, 3 },
new[] { 4, 5, 6 },
new[] { 7, 8, 9 },
};
protected override int TileSize => 100;
/// <summary>
/// 主服务器
/// </summary>
public JNGTileClient Master { get; private set; }
public override TileMasterSlaveEnum MSRole => TileMasterSlaveEnum.Slave;
public override SLogicSystem[] NewLogicSystems()
{
return new SLogicSystem[]
{
//基础数据
new DInputSystem(), //游戏输入
new DDataSystem(), //游戏数据
//逻辑层
new DMapSystem(), //游戏地图
new DWorldSystem(), //游戏逻辑
new DPlayerSystem(), //玩家逻辑
new DBossSystem(), //Boss逻辑
};
}
public override SDataSystemBase[] NewDataSystems()
{
return new SDataSystemBase[] {
new EDNodeDataSystem(SStateDataEnum.Server), //游戏数据
new EDPlayerDataSystem(SStateDataEnum.Server), //游戏数据
new EDBossDataSystem(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();
}
/// <summary>
/// 初始化服务器
/// </summary>
/// <returns></returns>
protected override async Task OnInit()
{
RandomSize = (await App.GAPI.NSyncTileRandomId).data;
await base.OnInit();
//添加Tile从服务器
App.Business.Send((int)NActionEnum.NAddTileServer,new JNAddTileServer()
{
Tile = TID,
Ip = "127.0.0.1",
Port = App.Server.Port,
Master = false
});
//更新主服务器
Timers.Instance.SetInterval(1f, UpdateTileSocket);
}
protected override async UniTask<int> FetchTileId()
{
await UniTask.NextFrame();
return 1;
}
protected override void OnRunSimulate()
{
//插入未处理输入
lock (Inputs)
{
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>
/// 连接主服务器
/// </summary>
private void UpdateTileSocket()
{
//如果有连接则直接返回
if (Master is not null) return;
//连接主服务器
OnMasterConnect();
}
private async void OnMasterConnect()
{
var message = (await App.GAPI.NSyncTileServer(TID));
if (Master is not null) return;
if (message.data is null) return;
Master = new JNGTileClient();
var info = message.data;
Debug.Log($"[JNGTileSlaveServerSystem {TID}] 连接 Socket");
Master.SetRole(JNGClientRole.SlaveServer);
Master.SetPoint($"{info.ip}:{info.port}");
Master.SetTileServer(info.server);
await Master.OnInit();
}
/// <summary>
/// 删除Socket
/// </summary>
public void RemoveSocket(string server)
{
if (Master is not null && Master.TileServer == server)
{
Master.OnClose();
Master = null;
}
}
}
}

3
JNFrame2/Assets/Scripts/AppGame/Sync/Tile/JNGTileSlaveServerSystem.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 234cd20f90624e6aa602e3ce4cd5c800
timeCreated: 1724639704