Skip to content

Multiplayer-arena-game / Multiplayer-arena-game-Entities

Go to a project
Commit f111cbb4 by alsunj
Options

remove team checkup from settargetslimesystem

parent b4e7688f
Inline Side-by-side
Showing with 785 additions and 181 deletions
Assets/_Game/Art/Shaders/gfhjf.shadergraph 0 → 100644
{
"m_SGVersion": 3,
"m_Type": "UnityEditor.ShaderGraph.GraphData",
"m_ObjectId": "4e407625cb164a9e85e9c4350be6582b",
"m_Properties": [],
"m_Keywords": [],
"m_Dropdowns": [],
"m_CategoryData": [
{
"m_Id": "752abf90435d4b86a9c21cfabd2c2b5f"
}
],
"m_Nodes": [
{
"m_Id": "4fb126c898ae4667a2abf14ca6f451a0"
},
{
"m_Id": "5d9448bdde044be4bc7a0f360cb48264"
},
{
"m_Id": "9f51ee6f95f84860a0ffae36a85eeddf"
},
{
"m_Id": "bc27d84c6d1e482dabde706ad82491c8"
},
{
"m_Id": "6faf6fe08cff4326a1e0f871c4e3195a"
},
{
"m_Id": "b99dfba99eb24b0284886d26ef6da919"
},
{
"m_Id": "9a8ba467eef34e6badabc782030ee6bc"
},
{
"m_Id": "5e2492d344cb4f04af72f9daaaa01b69"
},
{
"m_Id": "e8aab0389fc14bbc870f4d7569eb79af"
}
],
"m_GroupDatas": [],
"m_StickyNoteDatas": [],
"m_Edges": [],
"m_VertexContext": {
"m_Position": {
"x": 0.0,
"y": 0.0
},
"m_Blocks": [
{
"m_Id": "4fb126c898ae4667a2abf14ca6f451a0"
},
{
"m_Id": "5d9448bdde044be4bc7a0f360cb48264"
},
{
"m_Id": "9f51ee6f95f84860a0ffae36a85eeddf"
}
]
},
"m_FragmentContext": {
"m_Position": {
"x": 0.0,
"y": 200.0
},
"m_Blocks": [
{
"m_Id": "bc27d84c6d1e482dabde706ad82491c8"
},
{
"m_Id": "6faf6fe08cff4326a1e0f871c4e3195a"
},
{
"m_Id": "b99dfba99eb24b0284886d26ef6da919"
},
{
"m_Id": "9a8ba467eef34e6badabc782030ee6bc"
},
{
"m_Id": "5e2492d344cb4f04af72f9daaaa01b69"
},
{
"m_Id": "e8aab0389fc14bbc870f4d7569eb79af"
}
]
},
"m_PreviewData": {
"serializedMesh": {
"m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
"m_Guid": ""
},
"preventRotation": false
},
"m_Path": "Shader Graphs",
"m_GraphPrecision": 1,
"m_PreviewMode": 2,
"m_OutputNode": {
"m_Id": ""
},
"m_SubDatas": [],
"m_ActiveTargets": [
{
"m_Id": "69ee58f91cb2467e8437457ca33da81c"
}
]
}
{
"m_SGVersion": 2,
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget",
"m_ObjectId": "2499e192cd37424ea0a8350545224be9",
"m_WorkflowMode": 1,
"m_NormalDropOffSpace": 0,
"m_ClearCoat": false,
"m_BlendModePreserveSpecular": true
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
"m_ObjectId": "29230f9105784767a8f8a81ce7a9b032",
"m_Id": 0,
"m_DisplayName": "Tangent",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Tangent",
"m_StageCapability": 1,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_Space": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
"m_ObjectId": "35f4b7e3172b472e94155c58a9df8d99",
"m_Id": 0,
"m_DisplayName": "Emission",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Emission",
"m_StageCapability": 2,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_ColorMode": 1,
"m_DefaultColor": {
"r": 0.0,
"g": 0.0,
"b": 0.0,
"a": 1.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "482a9c0bdb2c4c9ea2c129e1b7772960",
"m_Id": 0,
"m_DisplayName": "Smoothness",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Smoothness",
"m_StageCapability": 2,
"m_Value": 0.5,
"m_DefaultValue": 0.5,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "4fb126c898ae4667a2abf14ca6f451a0",
"m_Group": {
"m_Id": ""
},
"m_Name": "VertexDescription.Position",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "9f97370ec63a42dd87e3c4561a8e32a8"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "VertexDescription.Position"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
"m_ObjectId": "554a032918c247c18432351cfc7fcd67",
"m_Id": 0,
"m_DisplayName": "Normal",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Normal",
"m_StageCapability": 1,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_Space": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "5d9448bdde044be4bc7a0f360cb48264",
"m_Group": {
"m_Id": ""
},
"m_Name": "VertexDescription.Normal",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "554a032918c247c18432351cfc7fcd67"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "VertexDescription.Normal"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "5e2492d344cb4f04af72f9daaaa01b69",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Emission",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "35f4b7e3172b472e94155c58a9df8d99"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Emission"
}
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
"m_ObjectId": "69ee58f91cb2467e8437457ca33da81c",
"m_Datas": [],
"m_ActiveSubTarget": {
"m_Id": "2499e192cd37424ea0a8350545224be9"
},
"m_AllowMaterialOverride": false,
"m_SurfaceType": 0,
"m_ZTestMode": 4,
"m_ZWriteControl": 0,
"m_AlphaMode": 0,
"m_RenderFace": 2,
"m_AlphaClip": false,
"m_CastShadows": true,
"m_ReceiveShadows": true,
"m_DisableTint": false,
"m_AdditionalMotionVectorMode": 0,
"m_AlembicMotionVectors": false,
"m_SupportsLODCrossFade": false,
"m_CustomEditorGUI": "",
"m_SupportVFX": false
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
"m_ObjectId": "6ca857d111cc40b7ae537f494c9710f9",
"m_Id": 0,
"m_DisplayName": "Normal (Tangent Space)",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "NormalTS",
"m_StageCapability": 2,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_Space": 3
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "6faf6fe08cff4326a1e0f871c4e3195a",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.NormalTS",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "6ca857d111cc40b7ae537f494c9710f9"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.NormalTS"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.CategoryData",
"m_ObjectId": "752abf90435d4b86a9c21cfabd2c2b5f",
"m_Name": "",
"m_ChildObjectList": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
"m_ObjectId": "84911b7749d24e6c9706a7504cac23a9",
"m_Id": 0,
"m_DisplayName": "Base Color",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "BaseColor",
"m_StageCapability": 2,
"m_Value": {
"x": 0.5,
"y": 0.5,
"z": 0.5
},
"m_DefaultValue": {
"x": 0.5,
"y": 0.5,
"z": 0.5
},
"m_Labels": [],
"m_ColorMode": 0,
"m_DefaultColor": {
"r": 0.5,
"g": 0.5,
"b": 0.5,
"a": 1.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "9a8ba467eef34e6badabc782030ee6bc",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Smoothness",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "482a9c0bdb2c4c9ea2c129e1b7772960"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Smoothness"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "9f51ee6f95f84860a0ffae36a85eeddf",
"m_Group": {
"m_Id": ""
},
"m_Name": "VertexDescription.Tangent",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "29230f9105784767a8f8a81ce7a9b032"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "VertexDescription.Tangent"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
"m_ObjectId": "9f97370ec63a42dd87e3c4561a8e32a8",
"m_Id": 0,
"m_DisplayName": "Position",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Position",
"m_StageCapability": 1,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_Space": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "b143df3adc234f3ba554c6e0ee43b8e7",
"m_Id": 0,
"m_DisplayName": "Ambient Occlusion",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Occlusion",
"m_StageCapability": 2,
"m_Value": 1.0,
"m_DefaultValue": 1.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "b99dfba99eb24b0284886d26ef6da919",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Metallic",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "e35590dc41c74e139445609a901ebff7"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Metallic"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "bc27d84c6d1e482dabde706ad82491c8",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.BaseColor",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "84911b7749d24e6c9706a7504cac23a9"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.BaseColor"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "e35590dc41c74e139445609a901ebff7",
"m_Id": 0,
"m_DisplayName": "Metallic",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Metallic",
"m_StageCapability": 2,
"m_Value": 0.0,
"m_DefaultValue": 0.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "e8aab0389fc14bbc870f4d7569eb79af",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Occlusion",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "b143df3adc234f3ba554c6e0ee43b8e7"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Occlusion"
}
Assets/_Game/Art/Shaders/gfhjf.shadergraph.meta 0 → 100644
fileFormatVersion: 2
guid: a03265075b68f9145972106b5625b316
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
Assets/_Game/Code/Input/NetcodePlayerInputAuthoring.cs → Assets/_Game/Code/Authoring/NetcodePlayerInputAuthoring.cs
......@@ -19,7 +19,6 @@ public class NetcodePlayerInputAuthoring : MonoBehaviour
AddComponent(entity, new NetcodePlayerInput());
AddComponent(entity, new PlayerSprintData
{
isSprinting = false,
sprintRemaining = authoring.sprintRemaining,
sprintDuration = authoring.sprintDuration,
sprintSpeed = authoring.sprintSpeed,
......
Assets/_Game/Code/Components/Combat/RespawnComponents.cs
......@@ -7,7 +7,7 @@ public struct RespawnEntityTag : IComponentData
{
}
public struct RespawnBufferElement : IBufferElementData
public struct RespawnBufferElement : IBufferElementData
{
[GhostField] public NetworkTick RespawnTick;
[GhostField] public Entity NetworkEntity;
......
Assets/_Game/Code/Components/Player/PlayerComponents.cs
......@@ -6,11 +6,11 @@ using UnityEngine;
public struct NetcodePlayerInput : IInputComponentData
{
public float2 inputVector;
public bool isSprinting;
}
public struct PlayerSprintData : IComponentData
{
public bool isSprinting;
public bool isSprintCooldown;
public float sprintRemaining;
public float sprintDuration;
......
Assets/_Game/Code/Systems/Combat/MoveSlimeSystem.cs
......@@ -4,12 +4,12 @@ using Unity.NetCode;
using Unity.Transforms;
[UpdateInGroup(typeof(PredictedSimulationSystemGroup))]
public partial struct MoveSlimeSystem : ISystem
{
public void OnCreate(ref SystemState state)
{
state.RequireForUpdate<NetworkTime>();
state.RequireForUpdate<EndSimulationEntityCommandBufferSystem.Singleton>();
state.RequireForUpdate<SlimeTargetDirection>();
state.RequireForUpdate<SlimeTag>();
}
......
Assets/_Game/Code/Systems/Combat/SetTargetSlimeSystem.cs
......@@ -21,14 +21,12 @@ public partial struct SetTargetSlimeSystem : ISystem
{
var ecbSingleton = SystemAPI.GetSingleton<BeginSimulationEntityCommandBufferSystem.Singleton>();
var teamLookup = SystemAPI.GetComponentLookup<TeamTypes>(true);
var transformLookup = SystemAPI.GetComponentLookup<LocalTransform>(true);
state.Dependency = new SetSlimeTargetDirectionJob
{
TeamLookup = teamLookup,
TransformLookup = transformLookup,
Ecb = ecbSingleton.CreateCommandBuffer(state.WorldUnmanaged).AsParallelWriter()
ECB = ecbSingleton.CreateCommandBuffer(state.WorldUnmanaged).AsParallelWriter()
}.ScheduleParallel(state.Dependency);
}
}
......@@ -37,32 +35,21 @@ public partial struct SetTargetSlimeSystem : ISystem
[BurstCompile]
public partial struct SetSlimeTargetDirectionJob : IJobEntity
{
[ReadOnly] public ComponentLookup<TeamTypes> TeamLookup;
[ReadOnly] public ComponentLookup<LocalTransform> TransformLookup;
public EntityCommandBuffer.ParallelWriter Ecb;
public EntityCommandBuffer.ParallelWriter ECB;
[BurstCompile]
private void Execute(in LocalTransform transform, in TeamTypes slimeTeam, in NpcTargetEntity targetEntity,
private void Execute(in LocalTransform transform, in NpcTargetEntity targetEntity,
in Entity entity)
{
if (targetEntity.Value == Entity.Null || !TransformLookup.HasComponent(targetEntity.Value) ||
!TeamLookup.HasComponent(targetEntity.Value))
if (targetEntity.Value == Entity.Null || !TransformLookup.HasComponent(targetEntity.Value))
{
Ecb.RemoveComponent<SlimeTargetDirection>(entity.Index, entity);
ECB.RemoveComponent<SlimeTargetDirection>(entity.Index, entity);
return;
}
var targetTeam = TeamLookup[targetEntity.Value].Value;
if (targetTeam != TeamType.Enemy)
{
var targetPosition = TransformLookup[targetEntity.Value].Position;
var direction = math.normalize(targetPosition - transform.Position);
Ecb.AddComponent(entity.Index, entity, new SlimeTargetDirection { Value = direction });
}
else
{
Ecb.RemoveComponent<SlimeTargetDirection>(entity.Index, entity);
}
var targetPosition = TransformLookup[targetEntity.Value].Position;
var direction = math.normalize(targetPosition - transform.Position);
ECB.AddComponent(entity.Index, entity, new SlimeTargetDirection { Value = direction });
}
}
\ No newline at end of file
Assets/_Game/Code/Systems/Destroy/DestroyEntitySystem.cs
......@@ -27,7 +27,6 @@ public partial struct DestroyEntitySystem : ISystem
var ecbSingleton = SystemAPI.GetSingleton<BeginSimulationEntityCommandBufferSystem.Singleton>();
var ecb = ecbSingleton.CreateCommandBuffer(state.WorldUnmanaged);
var entityManager = state.EntityManager;
foreach (var (transform, entity) in SystemAPI.Query<RefRW<LocalTransform>>()
.WithAll<DestroyEntityTag, Simulate>().WithEntityAccess())
......@@ -38,13 +37,6 @@ public partial struct DestroyEntitySystem : ISystem
{
var networkEntity = SystemAPI.GetComponent<NetworkEntityReference>(entity).Value;
// Check if networkEntity exists BEFORE accessing its components
if (!entityManager.Exists(networkEntity))
{
Debug.LogWarning(
$"networkEntity {networkEntity.Index}, Version: {networkEntity.Version} does not exist!");
continue; // Skip this player entity if networkEntity is already gone
}
var respawnEntity = SystemAPI.GetSingletonEntity<RespawnEntityTag>();
var respawnTickCount = SystemAPI.GetComponent<RespawnTickCount>(respawnEntity).Value;
......
Assets/_Game/Code/Systems/Input/NetcodePlayerInputSystem.cs
......@@ -18,17 +18,16 @@ public partial class NetcodePlayerInputSystem : SystemBase
RequireForUpdate<NetworkStreamInGame>();
RequireForUpdate<GamePlayingTag>();
RequireForUpdate<NetcodePlayerInput>();
RequireForUpdate<PlayerSprintData>();
}
protected override void OnUpdate()
{
foreach ((RefRW<NetcodePlayerInput> netcodePlayerInput, RefRW<PlayerSprintData> playerSprintData)
in SystemAPI.Query<RefRW<NetcodePlayerInput>, RefRW<PlayerSprintData>>()
foreach (RefRW<NetcodePlayerInput> netcodePlayerInput in SystemAPI.Query<RefRW<NetcodePlayerInput>>()
.WithAll<GhostOwnerIsLocal>())
{
netcodePlayerInput.ValueRW.inputVector = _inputActions.Player.Move.ReadValue<Vector2>();
playerSprintData.ValueRW.isSprinting = true;
netcodePlayerInput.ValueRW.isSprinting = _inputActions.Player.Sprint.IsPressed();
}
}
......
Assets/_Game/Code/Systems/Input/NetcodePlayerMovementSystem.cs
......@@ -33,13 +33,10 @@ partial struct NetcodePlayerMovementSystem : ISystem
{
float3 moveVector = new float3(netcodePlayerInput.ValueRO.inputVector.x, 0,
netcodePlayerInput.ValueRO.inputVector.y);
float moveSpeed;
if (sprintData.ValueRO.isSprinting)
moveSpeed = sprintData.ValueRO.walkSpeed;
else
moveSpeed = sprintData.ValueRO.sprintSpeed;
if (sprintData.ValueRO.isSprinting)
float moveSpeed = sprintData.ValueRO.walkSpeed;
if (netcodePlayerInput.ValueRO.isSprinting)
{
if (!sprintData.ValueRO.isSprintCooldown)
{
......@@ -49,14 +46,19 @@ partial struct NetcodePlayerMovementSystem : ISystem
sprintData.ValueRW.isSprintCooldown = true;
sprintData.ValueRW.sprintCooldown = sprintData.ValueRO.sprintCooldownReset;
}
else
{
moveSpeed = sprintData.ValueRO.sprintSpeed;
}
}
}
else
if (sprintData.ValueRO.isSprintCooldown)
{
if (!sprintData.ValueRO.isSprintCooldown)
sprintData.ValueRW.sprintCooldown -= deltaTime;
if (sprintData.ValueRW.sprintCooldown <= 0)
{
sprintData.ValueRW.sprintRemaining = math.clamp(sprintData.ValueRW.sprintRemaining + deltaTime, 0,
sprintData.ValueRO.sprintDuration);
sprintData.ValueRW.isSprintCooldown = false;
}
}
......
Assets/_Game/Mono/SpawnLocationVisual.cs 0 → 100644
using System;
using UnityEngine;
#if UNITY_EDITOR
public class SpawnLocationVisual : MonoBehaviour
{
public float radius = 5.0f; // Radius to draw around each child
// Draw Gizmos in the editor
void OnDrawGizmos()
{
foreach (Transform child in transform)
{
Gizmos.color = Color.red;
Gizmos.DrawWireSphere(child.position, radius);
}
}
}
#endif
\ No newline at end of file
Assets/_Game/Mono/SpawnLocationVisual.cs.meta 0 → 100644
fileFormatVersion: 2
guid: 7df08853308cf284c8f0993cd5dcf2e9
\ No newline at end of file
Assets/_Game/Prefabs/Enemies/Cube.prefab
......@@ -64,7 +64,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3}
m_Name:
m_EditorClassIdentifier:
DefaultGhostMode: 1
DefaultGhostMode: 0
SupportedGhostModes: 3
OptimizationMode: 0
Importance: 500
......
Assets/_Game/Prefabs/Player/Player.prefab
......@@ -147,10 +147,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a82f6d8766908894faabdee547539756, type: 3}
m_Name:
m_EditorClassIdentifier:
sprintRemaining: 8
sprintDuration: 8
sprintSpeed: 25
walkSpeed: 1
sprintRemaining: 5
sprintDuration: 5
sprintSpeed: 12
walkSpeed: 8
sprintCooldownReset: 1
--- !u!114 &3955402020692204287
MonoBehaviour:
......
Assets/_Game/Scenes/GameScene.unity
......@@ -119,134 +119,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &330585543
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 330585546}
- component: {fileID: 330585545}
- component: {fileID: 330585547}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!20 &330585545
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &330585546
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
serializedVersion: 2
m_LocalRotation: {x: 0.33709526, y: 0, z: 0, w: 0.94147056}
m_LocalPosition: {x: -2.61, y: 13.04, z: -23.57}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &330585547
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 1
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!1 &410087039
GameObject:
m_ObjectHideFlags: 0
......@@ -699,7 +571,6 @@ Transform:
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 330585546}
- {fileID: 538770928}
- {fileID: 410087041}
- {fileID: 1530776037}
......
Assets/_Game/Scenes/GameScene/GameSubScene.unity
......@@ -136,13 +136,29 @@ PrefabInstance:
value: Environment
objectReference: {fileID: 0}
- target: {fileID: 2185406100811654051, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.x
value: 20.47
objectReference: {fileID: 0}
- target: {fileID: 2185406100811654051, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2185406100811654051, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.z
value: -23.16
objectReference: {fileID: 0}
- target: {fileID: 2470590900687131865, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.x
value: -22.12
objectReference: {fileID: 0}
- target: {fileID: 2470590900687131865, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2470590900687131865, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.z
value: -21.96
objectReference: {fileID: 0}
- target: {fileID: 3251327355353088423, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.x
value: 0
......@@ -184,13 +200,29 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4113111654433410427, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.x
value: 20.18
objectReference: {fileID: 0}
- target: {fileID: 4113111654433410427, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4113111654433410427, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.z
value: 18.76
objectReference: {fileID: 0}
- target: {fileID: 4897543871710356616, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.x
value: -21.88
objectReference: {fileID: 0}
- target: {fileID: 4897543871710356616, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4897543871710356616, guid: 2533a95934a9ea044a5454189730090b, type: 3}
propertyPath: m_LocalPosition.z
value: 19.01
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 2747717236950027111, guid: 2533a95934a9ea044a5454189730090b, type: 3}
m_RemovedGameObjects: []
......@@ -199,12 +231,33 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 220856686291130790, guid: 2533a95934a9ea044a5454189730090b, type: 3}
insertIndex: -1
addedObject: {fileID: 719164832}
- targetCorrespondingSourceObject: {fileID: 8303283688989544350, guid: 2533a95934a9ea044a5454189730090b, type: 3}
insertIndex: -1
addedObject: {fileID: 349230730}
m_SourcePrefab: {fileID: 100100000, guid: 2533a95934a9ea044a5454189730090b, type: 3}
--- !u!4 &320754107 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2185406100811654051, guid: 2533a95934a9ea044a5454189730090b, type: 3}
m_PrefabInstance: {fileID: 285643545}
m_PrefabAsset: {fileID: 0}
--- !u!1 &349230728 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8303283688989544350, guid: 2533a95934a9ea044a5454189730090b, type: 3}
m_PrefabInstance: {fileID: 285643545}
m_PrefabAsset: {fileID: 0}
--- !u!114 &349230730
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 349230728}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7df08853308cf284c8f0993cd5dcf2e9, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 5
--- !u!4 &483085529 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4113111654433410427, guid: 2533a95934a9ea044a5454189730090b, type: 3}
......
Packages/manifest.json
......@@ -10,6 +10,7 @@
"com.unity.multiplayer.center": "1.0.0",
"com.unity.multiplayer.playmode": "1.3.3",
"com.unity.netcode": "1.4.0",
"com.unity.performance.profile-analyzer": "1.2.3",
"com.unity.physics": "1.3.10",
"com.unity.render-pipelines.universal": "17.0.3",
"com.unity.test-framework": "1.4.5",
......
Packages/packages-lock.json
......@@ -155,6 +155,13 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.performance.profile-analyzer": {
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.physics": {
"version": "1.3.10",
"depth": 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment