diff --git a/Assets/DefaultNetworkPrefabs.asset b/Assets/DefaultNetworkPrefabs.asset index c79c12fb..3954007f 100644 --- a/Assets/DefaultNetworkPrefabs.asset +++ b/Assets/DefaultNetworkPrefabs.asset @@ -19,3 +19,8 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 5581648761285601425, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index b89c90e0..dcfdebb9 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 1242716222252539497} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -104,7 +104,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject - GlobalObjectIdHash: 291279334 + GlobalObjectIdHash: 652883547 InScenePlacedSourceGlobalObjectIdHash: 0 DeferredDespawnTick: 0 Ownership: 1 diff --git a/Assets/Scenes/Test.meta b/Assets/Scenes/Test.meta new file mode 100644 index 00000000..8f33f59d --- /dev/null +++ b/Assets/Scenes/Test.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a500d11785b95a4418c91daa85deb363 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity index bcac1894..0f471b60 100644 --- a/Assets/Scenes/Test.unity +++ b/Assets/Scenes/Test.unity @@ -1575,6 +1575,7 @@ GameObject: - component: {fileID: 1797510780} - component: {fileID: 1797510779} - component: {fileID: 1797510778} + - component: {fileID: 1797510782} m_Layer: 0 m_Name: Plane m_TagString: Untagged @@ -1676,6 +1677,38 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1797510782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797510777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.AI.Navigation::Unity.AI.Navigation.NavMeshSurface + m_SerializedVersion: 0 + m_AgentTypeID: 0 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.16666667 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 23800000, guid: 2d20812228d7d384799f8a081dc7e46c, type: 2} + m_BuildHeightMesh: 0 --- !u!1 &1822286632 GameObject: m_ObjectHideFlags: 0 @@ -1925,6 +1958,67 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7078605118272955058, guid: 54087b4bd46db9e4fb7da13cf7a6cc69, type: 3} m_PrefabInstance: {fileID: 437791323} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7439438707585285505 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8365735130060185995, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: GlobalObjectIdHash + value: 3958201435 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3122493901255878198, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5581648761285601425, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} + propertyPath: m_Name + value: SM_Chr_BR_Troll_01 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56986b707b0dc09439cb35ff2f87dcc9, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1936,3 +2030,4 @@ SceneRoots: - {fileID: 1822286634} - {fileID: 1797510781} - {fileID: 260528176} + - {fileID: 7439438707585285505} diff --git a/Assets/Scenes/Test/NavMesh-Plane.asset b/Assets/Scenes/Test/NavMesh-Plane.asset new file mode 100644 index 00000000..c966756e Binary files /dev/null and b/Assets/Scenes/Test/NavMesh-Plane.asset differ diff --git a/Assets/Scenes/Test/NavMesh-Plane.asset.meta b/Assets/Scenes/Test/NavMesh-Plane.asset.meta new file mode 100644 index 00000000..fd64aaae --- /dev/null +++ b/Assets/Scenes/Test/NavMesh-Plane.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d20812228d7d384799f8a081dc7e46c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Colosseum.Game.asmdef b/Assets/Scripts/Colosseum.Game.asmdef index 9f849cf1..f4ee8402 100644 --- a/Assets/Scripts/Colosseum.Game.asmdef +++ b/Assets/Scripts/Colosseum.Game.asmdef @@ -6,7 +6,8 @@ "Unity.Networking.Transport", "Unity.Transport", "Unity.InputSystem", - "Unity.TextMeshPro" + "Unity.TextMeshPro", + "Unity.Behavior" ], "includePlatforms": [], "excludePlatforms": [],