From d1d2691159a3fcf482215b20d3cdac29a4e5e11f Mon Sep 17 00:00:00 2001 From: mischa Date: Sat, 13 Jul 2024 19:01:15 +0200 Subject: [PATCH] Tanks demo fixes --- .../Examples/Tanks/Prefabs/Projectile.prefab | 30 +----- .../Mirror/Examples/Tanks/Prefabs/Tank.prefab | 91 +++++++++++++------ .../TankProjectile/TankProjectile.mat | 9 +- 3 files changed, 75 insertions(+), 55 deletions(-) diff --git a/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab b/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab index 9f8e65b0b..ed26c53d4 100644 --- a/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab +++ b/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 63476987332307980} - serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24373266488650541} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &9118274893554935717 MeshFilter: @@ -110,14 +110,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5890560936853567077} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8035186136109819211} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1713098107664522388 MonoBehaviour: @@ -153,7 +153,7 @@ MonoBehaviour: syncInterval: 0.1 destroyAfter: 2 rigidBody: {fileID: 4629190479245867726} - force: 1000 + force: 2000 --- !u!136 &2355290524794870353 CapsuleCollider: m_ObjectHideFlags: 0 @@ -162,17 +162,8 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5890560936853567077} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 1 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 m_Radius: 0.1 m_Height: 0.4 m_Direction: 2 @@ -184,21 +175,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5890560936853567077} - serializedVersion: 4 + serializedVersion: 2 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 1 diff --git a/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab b/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab index 08663ed9b..60c8bd602 100644 --- a/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab +++ b/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab @@ -28,7 +28,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1916082411674582} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -37,6 +36,7 @@ Transform: - {fileID: 5803173220413450940} - {fileID: 2155495746218491392} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114118589361100106 MonoBehaviour: @@ -146,7 +146,8 @@ MonoBehaviour: turret: {fileID: 5803173220413450936} rotationSpeed: 80 shootKey: 32 - projectilePrefab: {fileID: 5890560936853567077, guid: b7dd46dbf38c643f09e206f9fa4be008, type: 3} + projectilePrefab: {fileID: 5890560936853567077, guid: b7dd46dbf38c643f09e206f9fa4be008, + type: 3} projectileMount: {fileID: 606281948174800110} health: 5 --- !u!195 &6900008319038825817 @@ -159,10 +160,10 @@ NavMeshAgent: m_Enabled: 1 m_AgentTypeID: 0 m_Radius: 4 - m_Speed: 5 + m_Speed: 10 m_Acceleration: 1 avoidancePriority: 50 - m_AngularSpeed: 120 + m_AngularSpeed: 240 m_StoppingDistance: 0 m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 @@ -197,13 +198,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6882277736259849937} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalPosition: {x: 0, y: 5, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4492442352427800} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &3883687817794100885 MeshRenderer: @@ -257,7 +258,7 @@ TextMesh: m_GameObject: {fileID: 6882277736259849937} m_Text: ----- m_OffsetZ: 0 - m_CharacterSize: 1 + m_CharacterSize: 2 m_LineSpacing: 1 m_Anchor: 4 m_Alignment: 1 @@ -268,7 +269,7 @@ TextMesh: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Color: serializedVersion: 2 - rgba: 4294967295 + rgba: 4285098495 --- !u!114 &6248426133561649027 MonoBehaviour: m_ObjectHideFlags: 0 @@ -286,75 +287,111 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 4492442352427800} m_Modifications: - - target: {fileID: 3638700596990255941, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990255941, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_Name value: BasePrefab objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + - target: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} + propertyPath: m_Height + value: 0.033200573 + objectReference: {fileID: 0} + - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} + propertyPath: m_Radius + value: 0.0014999999 + objectReference: {fileID: 0} + - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} + propertyPath: m_Center.y + value: 0.018600287 + objectReference: {fileID: 0} + - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} + propertyPath: m_Center.z + value: -5.483116e-10 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} --- !u!4 &606281948174800110 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7683056980803567927, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + m_CorrespondingSourceObject: {fileID: 7683056980803567927, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} m_PrefabInstance: {fileID: 7130959241934869977} m_PrefabAsset: {fileID: 0} --- !u!95 &5803173220405953878 stripped Animator: - m_CorrespondingSourceObject: {fileID: 3638700596980764815, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + m_CorrespondingSourceObject: {fileID: 3638700596980764815, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} m_PrefabInstance: {fileID: 7130959241934869977} m_PrefabAsset: {fileID: 0} --- !u!4 &5803173220413450936 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3638700596990361441, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + m_CorrespondingSourceObject: {fileID: 3638700596990361441, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} m_PrefabInstance: {fileID: 7130959241934869977} m_PrefabAsset: {fileID: 0} --- !u!4 &5803173220413450940 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} + m_CorrespondingSourceObject: {fileID: 3638700596990361445, guid: dad07e68d3659e6439279d0d4110cf4c, + type: 3} m_PrefabInstance: {fileID: 7130959241934869977} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Mirror/Examples/_Common/Projectiles/TankProjectile/TankProjectile.mat b/Assets/Mirror/Examples/_Common/Projectiles/TankProjectile/TankProjectile.mat index 5b8306b03..cd65746d4 100644 --- a/Assets/Mirror/Examples/_Common/Projectiles/TankProjectile/TankProjectile.mat +++ b/Assets/Mirror/Examples/_Common/Projectiles/TankProjectile/TankProjectile.mat @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TankProjectile - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -55,6 +56,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -75,3 +77,4 @@ Material: m_Colors: - _Color: {r: 0, g: 1, b: 0.8901961, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: []