diff --git a/Assets/Materials/Boll.mat b/Assets/Materials/Boll.mat new file mode 100644 index 0000000..7daf1b0 --- /dev/null +++ b/Assets/Materials/Boll.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Boll + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 2.4622889, g: 2.4622889, b: 2.4622889, a: 1} diff --git a/Assets/Materials/Boll.mat.meta b/Assets/Materials/Boll.mat.meta new file mode 100644 index 0000000..26f4176 --- /dev/null +++ b/Assets/Materials/Boll.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 929d28945c59076468ec1b791b7c0198 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Red.mat b/Assets/Materials/Red.mat index 5354c1a..e3c131e 100644 --- a/Assets/Materials/Red.mat +++ b/Assets/Materials/Red.mat @@ -73,5 +73,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 0.026643876, b: 0, a: 1} + - _Color: {r: 1, g: 0, b: 0.012441635, a: 1} - _EmissionColor: {r: 3.3914542, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/White.mat b/Assets/Materials/White.mat new file mode 100644 index 0000000..f98c9fc --- /dev/null +++ b/Assets/Materials/White.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: White + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 1 + - _GlossyReflections: 1 + - _Metallic: 1 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 3.037358, g: 3.037358, b: 3.037358, a: 1} diff --git a/Assets/Materials/White.mat.meta b/Assets/Materials/White.mat.meta new file mode 100644 index 0000000..f339d4e --- /dev/null +++ b/Assets/Materials/White.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4e5eba6a2b0b8641b87b21c3239a947 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/boost.blend b/Assets/Models/boost.blend new file mode 100644 index 0000000..962f4ce --- /dev/null +++ b/Assets/Models/boost.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cd217a2ae0ef43699e08a25b230c96b4fd0b4ed97e3ba849f2eee4d02cd83d9 +size 626792 diff --git a/Assets/Models/boost.blend.meta b/Assets/Models/boost.blend.meta new file mode 100644 index 0000000..a0c3534 --- /dev/null +++ b/Assets/Models/boost.blend.meta @@ -0,0 +1,95 @@ +fileFormatVersion: 2 +guid: 03a194d7a48bcd74e8a15bc7673002c0 +ModelImporter: + serializedVersion: 26 + internalIDToNameTable: [] + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/boost.blend1 b/Assets/Models/boost.blend1 new file mode 100644 index 0000000..e6b086e Binary files /dev/null and b/Assets/Models/boost.blend1 differ diff --git a/Assets/Models/boost.blend1.meta b/Assets/Models/boost.blend1.meta new file mode 100644 index 0000000..c017bc7 --- /dev/null +++ b/Assets/Models/boost.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f225e77ec58ea414197697d32446c150 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/ship5.blend b/Assets/Models/ship5.blend index dd53863..5bb732f 100644 --- a/Assets/Models/ship5.blend +++ b/Assets/Models/ship5.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc0b55b674291656a8012950c8b9b0422da6e90301fe23a6e63fa40cee211826 -size 631376 +oid sha256:8ee0dc78b92dad6ca7e22564949a533ae41ef491975be91e9d4e3c9e5e709333 +size 631232 diff --git a/Assets/Models/ship5.blend1 b/Assets/Models/ship5.blend1 index 8e60cb0..3e920dd 100644 Binary files a/Assets/Models/ship5.blend1 and b/Assets/Models/ship5.blend1 differ diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 1228314..38b6903 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -245,6 +245,7 @@ GameObject: - component: {fileID: 1046011662954448653} - component: {fileID: 1046011662954448654} - component: {fileID: 1046011662954448650} + - component: {fileID: 6868944914687015157} m_Layer: 0 m_Name: ForceZone m_TagString: Untagged @@ -260,9 +261,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1046011662954448640} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.39, z: -2.8} - m_LocalScale: {x: 1.8, y: 1, z: 4} - m_Children: [] + m_LocalPosition: {x: -0, y: 0.39, z: -1.15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7660261297212069549} m_Father: {fileID: 1046011661964092271} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -273,7 +275,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1046011662954448640} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + m_Mesh: {fileID: -5495902117074765545, guid: 03a194d7a48bcd74e8a15bc7673002c0, type: 3} --- !u!23 &1046011662954448652 MeshRenderer: m_ObjectHideFlags: 0 @@ -321,7 +323,7 @@ BoxCollider: m_GameObject: {fileID: 1046011662954448640} m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -338,7 +340,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: force: 2200 - player: {fileID: 1046011661964092256} + forceOrigin: {fileID: 3551438943167604206} --- !u!82 &1046011662954448650 AudioSource: m_ObjectHideFlags: 0 @@ -435,6 +437,50 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!64 &6868944914687015157 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046011662954448640} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 14 + m_Mesh: {fileID: -5495902117074765545, guid: 03a194d7a48bcd74e8a15bc7673002c0, type: 3} +--- !u!1 &3551438943167604206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7660261297212069549} + m_Layer: 0 + m_Name: ForceOrigin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7660261297212069549 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551438943167604206} + 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_Children: [] + m_Father: {fileID: 1046011662954448655} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &5779473222707195751 MeshCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index ac89d16..824baff 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -135,6 +135,7 @@ GameObject: - component: {fileID: 10774712} - component: {fileID: 10774718} - component: {fileID: 10774717} + - component: {fileID: 10774719} m_Layer: 0 m_Name: Boll m_TagString: Ball @@ -188,7 +189,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 929d28945c59076468ec1b791b7c0198, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -226,10 +227,10 @@ Transform: m_GameObject: {fileID: 10774711} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 2, z: 0} - m_LocalScale: {x: 4, y: 4, z: 4} + m_LocalScale: {x: 2, y: 2, z: 2} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &10774717 AudioSource: @@ -346,6 +347,141 @@ MonoBehaviour: - {fileID: 8300000, guid: 24cfc2e8f3df43642a3ecf98cd38100a, type: 3} - {fileID: 8300000, guid: 11369db0f03d06a41b94d37f12a01a1a, type: 3} - {fileID: 8300000, guid: 225dff5c48b88164a84497136d337530, type: 3} +--- !u!96 &10774719 +TrailRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10774711} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f3060dffc19587941ab40540b4aa9398, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Time: 0.15 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1.4 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0.35596573 + outSlope: -0.35596573 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.3288889 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.8589609 + outSlope: -0.8589609 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.102222204 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_Autodestruct: 0 + m_Emitting: 1 +--- !u!1 &126011450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 126011452} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &126011452 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126011450} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -19.013775, y: 0, z: -2.9949627} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &170055883 PrefabInstance: m_ObjectHideFlags: 0 @@ -358,6 +494,11 @@ PrefabInstance: propertyPath: m_Name value: PlayerRed objectReference: {fileID: 0} + - target: {fileID: 1046011661964092256, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, type: 3} propertyPath: m_LocalPosition.x @@ -396,7 +537,7 @@ PrefabInstance: - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, type: 3} @@ -413,10 +554,25 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} - target: {fileID: 1046011661964092265, guid: dc95d43174591064fa2b839a78374e0d, type: 3} propertyPath: m_Enabled - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1046011661964092265, guid: dc95d43174591064fa2b839a78374e0d, type: 3} @@ -428,6 +584,132 @@ PrefabInstance: propertyPath: targetGoal value: objectReference: {fileID: 643748445} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: aiControlled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: playerNumber + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: useController + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: movementSpeed + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: idleDrag + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: rotationSpeed + value: 490 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: boostSpeed + value: 4500 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: boostDuration + value: 0.35 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092269, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_IsKinematic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092269, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_CollisionDetection + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092269, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Mass + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092269, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_AngularDrag + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 5779473222707195751, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5779473222707195751, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Convex + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092270, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1046011662954448653, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8200272086808262891, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1046011662954448655, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.18 + objectReference: {fileID: 0} + - target: {fileID: 1046011662954448655, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1046011662954448655, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1046011662954448655, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1046011662954448651, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -5495902117074765545, guid: 03a194d7a48bcd74e8a15bc7673002c0, + type: 3} + - target: {fileID: 1046011662954448654, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: forceOrigin + value: + objectReference: {fileID: 1309199979} + - target: {fileID: 7660261297212069549, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc95d43174591064fa2b839a78374e0d, type: 3} --- !u!1 &268360628 @@ -457,7 +739,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268360628} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0.4, y: -0.3, z: 25} + m_LocalPosition: {x: 0.4, y: -0.3, z: 26} m_LocalScale: {x: 3, y: 1, z: 200.00012} m_Children: [] m_Father: {fileID: 1499531362} @@ -751,7 +1033,7 @@ Transform: - {fileID: 1657943317} - {fileID: 685653072} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &304138460 GameObject: @@ -876,7 +1158,7 @@ Transform: - {fileID: 655067604} - {fileID: 1463368306} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!114 &367746333 MonoBehaviour: @@ -1041,7 +1323,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 384291585} m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: -6.5, y: -0.3, z: -25} + m_LocalPosition: {x: -6.5, y: -0.3, z: -26} m_LocalScale: {x: 3, y: 1, z: 200.00012} m_Children: [] m_Father: {fileID: 1499531362} @@ -1233,7 +1515,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 562159198} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 45, y: -0.3, z: 8.1} + m_LocalPosition: {x: 45.5, y: -0.3, z: 8.1} m_LocalScale: {x: 3, y: 1, z: 200.00012} m_Children: [] m_Father: {fileID: 1499531362} @@ -1385,7 +1667,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 643748441} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 45, y: 0, z: 0.4} + m_LocalPosition: {x: 45.5, y: 0, z: 0.4} m_LocalScale: {x: 5, y: 4, z: 15} m_Children: [] m_Father: {fileID: 1499531362} @@ -1751,8 +2033,121 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &944065356 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -927199367670048503, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_Name + value: ship5 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalPosition.x + value: -14.89 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalPosition.z + value: 3.2 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c3862b83618c1d5458bea8944cabf466, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e9da5323b9c79a04289736c4b3423b12, type: 3} +--- !u!1 &944065357 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: e9da5323b9c79a04289736c4b3423b12, + type: 3} + m_PrefabInstance: {fileID: 944065356} + m_PrefabAsset: {fileID: 0} +--- !u!114 &944065358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944065357} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 705f5d0d0e160ed4199e6efbf2af34d2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!54 &944065362 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944065357} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -1768,7 +2163,7 @@ GameObject: m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera - m_Icon: {fileID: 0} + m_Icon: {fileID: 7422848464349959988, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 @@ -1909,6 +2304,11 @@ PrefabInstance: propertyPath: m_Name value: PlayerBlue objectReference: {fileID: 0} + - target: {fileID: 1046011661964092256, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, type: 3} propertyPath: m_LocalPosition.x @@ -1947,7 +2347,7 @@ PrefabInstance: - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, type: 3} @@ -1964,20 +2364,20 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, type: 3} - propertyPath: playerNumber - value: 3 + propertyPath: m_LocalScale.y + value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, type: 3} - propertyPath: aiControlled - value: 0 + propertyPath: m_LocalScale.x + value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + - target: {fileID: 1046011661964092271, guid: dc95d43174591064fa2b839a78374e0d, type: 3} - propertyPath: useController - value: 1 + propertyPath: m_LocalScale.z + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 1046011661964092265, guid: dc95d43174591064fa2b839a78374e0d, type: 3} @@ -1989,11 +2389,81 @@ PrefabInstance: propertyPath: targetGoal value: objectReference: {fileID: 1522218632} + - target: {fileID: 1046011661964092265, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092265, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: turnRadius + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092265, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: destinationOffset + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: playerNumber + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: aiControlled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: useController + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: rotationSpeed + value: 490 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: movementSpeed + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: idleDrag + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: boostSpeed + value: 4500 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: boostDuration + value: 0.35 + objectReference: {fileID: 0} + - target: {fileID: 1046011661964092269, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_AngularDrag + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 5779473222707195751, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7320905802000327887, guid: dc95d43174591064fa2b839a78374e0d, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 72fc025010d501b4f8cb635104c4fc72, type: 2} + - target: {fileID: 7634144564421577783, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc95d43174591064fa2b839a78374e0d, type: 3} --- !u!1 &1053063603 @@ -2060,7 +2530,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1228261470 GameObject: @@ -2154,7 +2624,7 @@ Transform: m_LocalScale: {x: 100, y: 2.8505, z: 100} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1228261475 MonoBehaviour: @@ -2343,6 +2813,62 @@ MonoBehaviour: blendDistance: 0 weight: 1 priority: 0 +--- !u!1 &1277757052 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1046011662954448640, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + m_PrefabInstance: {fileID: 170055883} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1277757058 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1046011662954448655, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + m_PrefabInstance: {fileID: 170055883} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1277757059 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277757052} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 14 + m_Mesh: {fileID: -5495902117074765545, guid: 03a194d7a48bcd74e8a15bc7673002c0, type: 3} +--- !u!1 &1309199979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1309199980} + m_Layer: 0 + m_Name: ForceOrigin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1309199980 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309199979} + 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_Children: [] + m_Father: {fileID: 1277757058} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1463368301 GameObject: m_ObjectHideFlags: 0 @@ -2377,7 +2903,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: force: 2200 - player: {fileID: 655067603} + forceOrigin: {fileID: 0} --- !u!65 &1463368303 BoxCollider: m_ObjectHideFlags: 0 @@ -2640,7 +3166,7 @@ RectTransform: - {fileID: 697913065} - {fileID: 1880081386} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2683,7 +3209,7 @@ Transform: - {fileID: 643748445} - {fileID: 304138461} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1522218628 GameObject: @@ -2772,7 +3298,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1522218628} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -45, y: 0, z: 0.4} + m_LocalPosition: {x: -45.5, y: 0, z: 0.4} m_LocalScale: {x: 5, y: 4, z: 15} m_Children: [] m_Father: {fileID: 1499531362} @@ -2922,7 +3448,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: force: 2200 - player: {fileID: 2145556004} + forceOrigin: {fileID: 0} --- !u!65 &1657943314 BoxCollider: m_ObjectHideFlags: 0 @@ -3199,7 +3725,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885071193} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: -45, y: -0.3, z: 7} + m_LocalPosition: {x: -45.5, y: -0.3, z: 7} m_LocalScale: {x: 3, y: 1, z: 200.00012} m_Children: [] m_Father: {fileID: 1499531362} diff --git a/Assets/Scripts/AIController.cs b/Assets/Scripts/AIController.cs index 474824e..92f041b 100644 --- a/Assets/Scripts/AIController.cs +++ b/Assets/Scripts/AIController.cs @@ -71,13 +71,13 @@ public class AIController : MonoBehaviour inputs[AiInputs.VERTICAL] = 1; } + Debug.DrawRay(transform.position, transform.TransformDirection(-Vector3.forward) * 8, Color.magenta, 0, false); inputs[AiInputs.HORIZONTAL] = Mathf.Floor(this.angleToDestination * 10) / 10; if (this.distanceToTarget < this.turnRadius) { inputs[AiInputs.HORIZONTAL] = Mathf.Floor(-this.angleToBall * 10) / 10; - Debug.DrawRay(transform.position, transform.TransformDirection(-Vector3.forward) * 10, Color.magenta, 0,false); - if (Physics.Raycast(transform.position, transform.TransformDirection(-Vector3.forward), 10)) + if (Physics.Raycast(transform.position, transform.TransformDirection(-Vector3.forward), 8)) { inputs[AiInputs.BOOST] = 1; } @@ -85,6 +85,7 @@ public class AIController : MonoBehaviour } + if (this.distanceToBall < this.turnRadius) { RaycastHit hit; diff --git a/Assets/Scripts/ForceZone.cs b/Assets/Scripts/ForceZone.cs index cb782da..2c53d51 100644 --- a/Assets/Scripts/ForceZone.cs +++ b/Assets/Scripts/ForceZone.cs @@ -5,7 +5,7 @@ using UnityEngine; public class ForceZone : MonoBehaviour { public float force = 0; - public GameObject player; + public GameObject forceOrigin; // Start is called before the first frame update void Start() { @@ -20,7 +20,7 @@ public class ForceZone : MonoBehaviour private void OnTriggerStay(Collider other) { - Vector3 direction = other.transform.position - this.player.transform.position; + Vector3 direction = other.transform.position - this.forceOrigin.transform.position; Debug.DrawRay(this.transform.position, direction); Rigidbody otherRigidbody = other.transform.GetComponent(); diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index ed60423..4736e49 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -33,6 +33,7 @@ public class PlayerController : MonoBehaviour } } + // Update is called once per frame void Update() { @@ -48,11 +49,20 @@ public class PlayerController : MonoBehaviour aiInput = this.aiController.GetInputs(); rotationDirection = aiInput[AiInputs.HORIZONTAL]; movementDirection = aiInput[AiInputs.VERTICAL]; + } if (this.useController) { //Debug.Log(Input.GetAxis("VerticalBack" + this.playerNumber)); - movementDirection = Input.GetAxis("VerticalBack" + this.playerNumber) > 0 ? -1 : movementDirection; + movementDirection = Input.GetAxis("Horizontal" + this.playerNumber) != 0 ? 1 : movementDirection; + + float horizontal = Input.GetAxis("Horizontal3"); + float vertical = Input.GetAxis("Vertical3"); + if (movementDirection != 0) + { + Vector3 direction = new Vector3(horizontal, 0, -vertical).normalized; + this.transform.rotation = Quaternion.LookRotation(direction, Vector3.up); + } } //Links @@ -67,18 +77,19 @@ public class PlayerController : MonoBehaviour transform.Rotate(Vector3.up, -this.rotationSpeed * Time.deltaTime); } + Debug.Log(movementDirection); //Forward - if (movementDirection > 0) + if (movementDirection != 0) { this.rb.drag = this.drag; this.rb.AddRelativeForce(Vector3.forward * this.movementSpeed * Time.deltaTime, ForceMode.Impulse); } //Zurück - if (movementDirection < 0) - { - this.rb.AddRelativeForce(Vector3.back * this.movementSpeed / 2 * Time.deltaTime, ForceMode.Impulse); - } + //if (movementDirection < 0) + //{ + // this.rb.AddRelativeForce(Vector3.back * this.movementSpeed / 2 * Time.deltaTime, ForceMode.Impulse); + //} //Boost if (Input.GetButtonDown("Boost" + this.playerNumber) || aiInput[AiInputs.BOOST] > 0 && !this.lockBoost) @@ -99,5 +110,7 @@ public class PlayerController : MonoBehaviour this.forceZone.SetActive(false); } + + } } diff --git a/Assets/Scripts/test.cs b/Assets/Scripts/test.cs new file mode 100644 index 0000000..4698049 --- /dev/null +++ b/Assets/Scripts/test.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class test : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + private void OnDrawGizmos() + { + + } + // Update is called once per frame + void Update() + { + //float horizontal = Input.GetAxis("Horizontal3"); + //float vertical = Input.GetAxis("Vertical3"); + //Vector3 direction = new Vector3(horizontal, 0, -vertical).normalized; + //this.transform.rotation = Quaternion.LookRotation(Vector3.up, direction); + + //this.transform.position += Vector3.forward * -10 * Time.deltaTime; + } +} diff --git a/Assets/Scripts/test.cs.meta b/Assets/Scripts/test.cs.meta new file mode 100644 index 0000000..bf12000 --- /dev/null +++ b/Assets/Scripts/test.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 705f5d0d0e160ed4199e6efbf2af34d2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 1973018..a8719fd 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -48,7 +48,7 @@ InputManager: gravity: 100000 dead: 0.3 sensitivity: 1 - snap: 1 + snap: 0 invert: 0 type: 2 axis: 0 @@ -96,10 +96,10 @@ InputManager: gravity: 10000 dead: 0.02 sensitivity: 3 - snap: 1 + snap: 0 invert: 0 type: 2 - axis: 2 + axis: 1 joyNum: 0 - serializedVersion: 3 m_Name: VerticalBack3 diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index 5ca71aa..558a017 100644 --- a/ProjectSettings/TimeManager.asset +++ b/ProjectSettings/TimeManager.asset @@ -5,5 +5,5 @@ TimeManager: m_ObjectHideFlags: 0 Fixed Timestep: 0.02 Maximum Allowed Timestep: 0.33333334 - m_TimeScale: 0.8 + m_TimeScale: 1 Maximum Particle Timestep: 0.03