Skip to content

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

Go to a project
Commit c1e96f4f by alsunj
Options

fix errors

parent ded0dcb1
Expand all
Inline Side-by-side
Showing with 25 additions and 118 deletions
Assets/_Game/Art/skeleton.mat
...@@ -12,8 +12,7 @@ Material: ...@@ -12,8 +12,7 @@ Material:
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords: []
m_InvalidKeywords: m_InvalidKeywords: []
- _EMISSION
m_LightmapFlags: 0 m_LightmapFlags: 0
m_EnableInstancingVariants: 1 m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
......
Assets/_Game/Code/AnimatorReference.cs
using Unity.Entities; using Unity.Entities;
using UnityEngine; using UnityEngine;
\ No newline at end of file
public class AnimatorReference : MonoBehaviour
{
public Animator animatorReference;
}
public struct AnimatorReferenceComponent : ICleanupComponentData
{
public Animator animatorReference;
}
\ No newline at end of file
Assets/_Game/Code/Systems/Connection/GoInGameServerSystem.cs
...@@ -53,11 +53,6 @@ partial struct GoInGameServerSystem : ISystem ...@@ -53,11 +53,6 @@ partial struct GoInGameServerSystem : ISystem
{ {
Value = playerEntity Value = playerEntity
}); });
Animator animator = authoring.playerPrefabGameObject.GetComponent<Animator>();
entityCommandBuffer.AddComponent(playerEntity, new AnimatorComponent
{
animatorEntity = animator
});
} }
entityCommandBuffer.Playback(state.EntityManager); entityCommandBuffer.Playback(state.EntityManager);
......
Assets/_Game/Code/Systems/Input/ClientCameraSystem.cs deleted 100644 → 0
using Unity.Burst;
using Unity.Entities;
using Unity.NetCode;
using Unity.NetCode.Hybrid;
using UnityEngine;
[WorldSystemFilter(WorldSystemFilterFlags.ClientSimulation)]
partial struct ClientCameraSystem : ISystem
{
[BurstCompile]
public void OnCreate(ref SystemState state)
{
state.RequireForUpdate<NetworkId>();
}
[BurstCompile]
public void OnUpdate(ref SystemState state)
{
var ghostPresentationGameObjectSystem =
state.World.GetExistingSystemManaged<GhostPresentationGameObjectSystem>();
var entityManager = state.EntityManager;
foreach (var (cameraFollow, entity) in SystemAPI.Query<RefRO<CameraFollow>>().WithEntityAccess())
{
GameObject cameraGameObject =
ghostPresentationGameObjectSystem.GetGameObjectForEntity(entityManager, entity);
if (cameraGameObject != null)
{
Camera cameraComponent = cameraGameObject.GetComponent<Camera>();
if (cameraComponent != null)
{
// Set the camera's tag to "MainCamera"
cameraComponent.tag = "MainCamera";
}
}
}
}
[BurstCompile]
public void OnDestroy(ref SystemState state)
{
}
}
\ No newline at end of file
Assets/_Game/Code/Systems/Input/ClientCameraSystem.cs.meta deleted 100644 → 0
fileFormatVersion: 2
guid: 82663c2222578814994ce647df9487fd
\ No newline at end of file
Assets/_Game/Prefabs/Enemies.meta 0 → 100644
fileFormatVersion: 2
guid: 48373ec0e2c22c042b4674fd0ad2715d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Prefabs/Player/Cube.prefab
...@@ -15,7 +15,6 @@ GameObject: ...@@ -15,7 +15,6 @@ GameObject:
- component: {fileID: -1646835149202598146} - component: {fileID: -1646835149202598146}
- component: {fileID: -202488746562016087} - component: {fileID: -202488746562016087}
- component: {fileID: -6588502853141303043} - component: {fileID: -6588502853141303043}
- component: {fileID: 4663103396279588658}
- component: {fileID: 7308881765750536992} - component: {fileID: 7308881765750536992}
m_Layer: 0 m_Layer: 0
m_Name: Cube m_Name: Cube
...@@ -177,26 +176,6 @@ Rigidbody: ...@@ -177,26 +176,6 @@ Rigidbody:
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 84 m_Constraints: 84
m_CollisionDetection: 0 m_CollisionDetection: 0
--- !u!114 &4663103396279588658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2899838405596494908}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a82f6d8766908894faabdee547539756, type: 3}
m_Name:
m_EditorClassIdentifier:
sprintRemaining: 5
sprintDuration: 5
sprintSpeed: 12
walkSpeed: 9
sprintCooldownReset: 2
sprintFOV: 90
walkFOV: 60
sprintFOVStepTime: 0.1
--- !u!114 &7308881765750536992 --- !u!114 &7308881765750536992
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Assets/_Game/Prefabs/Player/Player.prefab
...@@ -250,9 +250,6 @@ PrefabInstance: ...@@ -250,9 +250,6 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e8747e16efffd7a47afd2563a3a381bd, type: 3} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e8747e16efffd7a47afd2563a3a381bd, type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 6927830130995102561} addedObject: {fileID: 6927830130995102561}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e8747e16efffd7a47afd2563a3a381bd, type: 3}
insertIndex: -1
addedObject: {fileID: 4834828025956795603}
m_SourcePrefab: {fileID: 100100000, guid: e8747e16efffd7a47afd2563a3a381bd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e8747e16efffd7a47afd2563a3a381bd, type: 3}
--- !u!4 &7442153552013198971 stripped --- !u!4 &7442153552013198971 stripped
Transform: Transform:
...@@ -286,16 +283,3 @@ Animator: ...@@ -286,16 +283,3 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0 m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0 m_WriteDefaultValuesOnDisable: 0
--- !u!114 &4834828025956795603
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7785606193239088321}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 70b14d298a846084abff9ccb30dc1b9a, type: 3}
m_Name:
m_EditorClassIdentifier:
animatorReference: {fileID: 6927830130995102561}
Assets/_Game/Scenes/GameScene/GameSubScene.unity
...@@ -199,7 +199,7 @@ GameObject: ...@@ -199,7 +199,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1434796876} - component: {fileID: 1434796876}
- component: {fileID: 1434796875} - component: {fileID: 1434796877}
m_Layer: 0 m_Layer: 0
m_Name: EntitiesReferences m_Name: EntitiesReferences
m_TagString: Untagged m_TagString: Untagged
...@@ -207,20 +207,6 @@ GameObject: ...@@ -207,20 +207,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!114 &1434796875
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1434796874}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2ec9ef53cb793a488a58d261a7220bb, type: 3}
m_Name:
m_EditorClassIdentifier:
playerPrefabGameObject: {fileID: 5874026590232167095, guid: 7ea025f0d02f62a4b8c0db52b410e781, type: 3}
animatorReference: {fileID: 0}
--- !u!4 &1434796876 --- !u!4 &1434796876
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -236,6 +222,19 @@ Transform: ...@@ -236,6 +222,19 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1434796877
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1434796874}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c2ec9ef53cb793a488a58d261a7220bb, type: 3}
m_Name:
m_EditorClassIdentifier:
playerPrefabGameObject: {fileID: 5874026590232167095, guid: 7ea025f0d02f62a4b8c0db52b410e781, type: 3}
--- !u!1660057539 &9223372036854775807 --- !u!1660057539 &9223372036854775807
SceneRoots: SceneRoots:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 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