临时提交

This commit is contained in:
DESKTOP-5RP3AKU\Jisol
2024-10-19 03:51:59 +08:00
parent 425f2eabea
commit 1315802fa2
162 changed files with 16452 additions and 11111 deletions

View File

@@ -79,7 +79,7 @@ namespace AppGame.Sync
/// <returns></returns>
protected override JNFrameInputs GetInputs()
{
return GetSystem<DInputSystem>().Dequeue();
return GetSystem<DInputSystem>().UIInputDequeue();
}
/// <summary>

View File

@@ -85,7 +85,7 @@ namespace AppGame.Sync
/// </summary>
protected void OnSendInput()
{
var inputs = GetSystem<DInputSystem>().Dequeue();
var inputs = GetSystem<DInputSystem>().UIInputDequeue();
if (inputs.Inputs.Count > 0)
{
//发送帧数据给服务端

View File

@@ -95,7 +95,7 @@ namespace AppGame.Sync
/// </summary>
private void OnSendInput()
{
var inputs = GetSystem<DInputSystem>().Dequeue();
var inputs = GetSystem<DInputSystem>().UIInputDequeue();
if (inputs.Inputs.Count > 0)
{
//发送帧数据给服务端

View File

@@ -59,7 +59,7 @@ namespace AppGame.Systems
/// <returns></returns>
public T GetInput<T>() where T : JNInputBase, new()
{
return Client.GetSystem<JNInputSystem>().Input<T>();
return Client.GetSystem<JNInputSystem>().UIInput<T>();
}
public T GetClient<T>() where T : JNSyncDefaultService
{

View File

@@ -1,35 +0,0 @@
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

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

View File

@@ -9,6 +9,7 @@ using JNGame.Sync.State.Tile.Entity;
using JNGame.Sync.System;
using JNGame.Sync.System.Data;
using JNGame.Network.Action;
using JNGame.Sync.System.Data.Type;
using TouchSocket.Core;
namespace Game.JNGState.Logic.Data

View File

@@ -2,7 +2,7 @@
using Game.JNGFrame.Logic.Entity.Controller;
using Game.Logic.Entity.Nodes.Component.Components;
using JNGame.Runtime.Util.Types;
using JNGame.Sync.Frame.Entity.Components;
using JNGame.Sync.Entity.Component;
namespace Game.Logic.Entity.Nodes.Component.Lookup
{

View File

@@ -1,7 +1,7 @@
using System;
using Game.Logic.Entity.Nodes.Component.Components;
using JNGame.Runtime.Util.Types;
using JNGame.Sync.Frame.Entity.Components;
using JNGame.Sync.Entity.Component;
namespace Game.Logic.Entity.Nodes.Component.Lookup

View File

@@ -2,7 +2,7 @@
using Game.JNGFrame.Logic.Entity.Controller;
using Game.Logic.Entity.Nodes.Component.Components;
using JNGame.Runtime.Util.Types;
using JNGame.Sync.Frame.Entity.Components;
using JNGame.Sync.Entity.Component;
namespace Game.Logic.Entity.Nodes.Component.Lookup
{

View File

@@ -1,9 +1,7 @@
using Game.JNGFrame.Logic.Entity.Controller;
using Game.JNGState.Logic.Data;
using Game.Logic.Entity.Nodes.Component.Components;
using Game.Logic.Entity.Nodes.Component.Lookup;
using JNGame.Sync.Frame.Entity.Components;
using JNGame.Sync.System.Data;
using JNGame.Sync.Entity.Component;
namespace Game.Logic.Entity.Nodes
{

View File

@@ -1,9 +1,6 @@
using Game.JNGState.Logic.Data;
using Game.Logic.Entity.Nodes.Component.Components;
using Game.Logic.Entity.Nodes.Component.Components;
using Game.Logic.Entity.Nodes.Component.Lookup;
using JNGame.Sync.Frame.Entity.Components;
using JNGame.Sync.State.Tile.Entity;
using JNGame.Sync.System.Data;
using JNGame.Sync.Entity.Component;
namespace Game.Logic.Entity.Nodes
{

View File

@@ -2,8 +2,7 @@
using Game.JNGState.Logic.Data;
using Game.Logic.Entity.Nodes.Component.Components;
using Game.Logic.Entity.Nodes.Component.Lookup;
using JNGame.Sync.Frame.Entity.Components;
using JNGame.Sync.State.Tile.Entity;
using JNGame.Sync.Entity.Component;
using JNGame.Sync.System.Data;
namespace Game.Logic.Entity.Nodes

View File

@@ -2,7 +2,6 @@
using JNGame.Runtime.Util;
using JNGame.Sync.System;
using JNGame.Sync.View;
using JNGame.Util;
namespace Game.JNGFrame.View
{

View File

@@ -1,13 +1,8 @@
using AppGame;
using AppGame.Sync;
using Cinemachine;
using System.Collections.Concurrent;
using AppGame;
using DG.Tweening;
using Game.JNGFrame.Logic.Entity;
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
@@ -38,9 +33,9 @@ namespace Game.JNGFrame.View.Entity
return view;
}
public override EDBossData[] GetData()
public override ConcurrentDictionary<ulong,EDBossData> GetData()
{
return GetService<EDBossDataSystem>().Datas;
return GetService<EDBossDataSystem>().Data;
}
public override void ViewRemove(GameObject view)

View File

@@ -1,4 +1,5 @@
using AppGame;
using System.Collections.Concurrent;
using AppGame;
using DG.Tweening;
using Game.JNGFrame.Logic.Entity;
using Game.JNGState.Logic.Data;
@@ -38,9 +39,9 @@ namespace Game.JNGFrame.View.Entity
return view;
}
public override EDNodeData[] GetData()
public override ConcurrentDictionary<ulong,EDNodeData> GetData()
{
return GetService<EDNodeDataSystem>().Datas;
return GetService<EDNodeDataSystem>().Data;
}
public override void ViewRemove(GameObject view)

View File

@@ -1,4 +1,6 @@
using AppGame;
using System.Collections.Concurrent;
using System.Collections.Generic;
using AppGame;
using AppGame.Sync;
using Cinemachine;
using DG.Tweening;
@@ -86,9 +88,9 @@ namespace Game.JNGFrame.View.Entity
return view;
}
public override EDPlayerData[] GetData()
public override ConcurrentDictionary<ulong,EDPlayerData> GetData()
{
return GetService<EDPlayerDataSystem>().Datas;
return GetService<EDPlayerDataSystem>().Data;
}
public override void ViewRemove(GameObject view)

View File

@@ -22,7 +22,7 @@ namespace Game.JNGFrame.View
base.Execute();
//调用改动
var dataList = GetData();
var dataList = GetData().Values;
foreach (var data in dataList){