diff --git a/Assets/Materials/Turrets/Turret3.mat b/Assets/Materials/Turrets/Turret3.mat new file mode 100644 index 0000000..9702701 --- /dev/null +++ b/Assets/Materials/Turrets/Turret3.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Turret3 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 1d4d33b31677e554fa66c5631c4dba65, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: 2800000, guid: 1d4d33b31677e554fa66c5631c4dba65, type: 3} + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &2121207260983276556 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/Materials/Turrets/Turret3.mat.meta b/Assets/Materials/Turrets/Turret3.mat.meta new file mode 100644 index 0000000..99e734f --- /dev/null +++ b/Assets/Materials/Turrets/Turret3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 977dfc05de6f9664c9e6439921574cb2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Turret3.fbx b/Assets/Models/Turret3.fbx new file mode 100644 index 0000000..dbb9e5d Binary files /dev/null and b/Assets/Models/Turret3.fbx differ diff --git a/Assets/Models/Turret3.fbx.meta b/Assets/Models/Turret3.fbx.meta new file mode 100644 index 0000000..da41b36 --- /dev/null +++ b/Assets/Models/Turret3.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 451c39e37fdfb644093b1369913fc88d +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + 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 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + 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} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/TurretLvl3.prefab b/Assets/Prefabs/TurretLvl3.prefab new file mode 100644 index 0000000..b31cd92 --- /dev/null +++ b/Assets/Prefabs/TurretLvl3.prefab @@ -0,0 +1,179 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8950653244194544620 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3542852092398272455, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalScale.x + value: 30.000004 + objectReference: {fileID: 0} + - target: {fileID: -3542852092398272455, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalScale.y + value: 30.000004 + objectReference: {fileID: 0} + - target: {fileID: -3542852092398272455, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalScale.z + value: 30.000004 + objectReference: {fileID: 0} + - target: {fileID: -3542852092398272455, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_Name + value: TurretLvl3 + objectReference: {fileID: 0} + - target: {fileID: 4083501151425157549, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalScale.x + value: 30.000004 + objectReference: {fileID: 0} + - target: {fileID: 4083501151425157549, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalScale.y + value: 30.000004 + objectReference: {fileID: 0} + - target: {fileID: 4083501151425157549, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalScale.z + value: 30.000004 + objectReference: {fileID: 0} + - target: {fileID: 4083501151425157549, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6317578925029434746, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 977dfc05de6f9664c9e6439921574cb2, type: 2} + - target: {fileID: 8632055958874330854, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalScale.x + value: 30.000004 + objectReference: {fileID: 0} + - target: {fileID: 8632055958874330854, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalScale.y + value: 30.000004 + objectReference: {fileID: 0} + - target: {fileID: 8632055958874330854, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_LocalScale.z + value: 30.000004 + objectReference: {fileID: 0} + - target: {fileID: 8632055958874330854, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1285167026773524547} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + insertIndex: -1 + addedObject: {fileID: 5443210462339960101} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + insertIndex: -1 + addedObject: {fileID: 539037596837637127} + m_SourcePrefab: {fileID: 100100000, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} +--- !u!1 &8139819142084880061 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 451c39e37fdfb644093b1369913fc88d, type: 3} + m_PrefabInstance: {fileID: 8950653244194544620} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1285167026773524547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8139819142084880061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d6715c95501a4f49bd34c8832850f32, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::BlockScript + _type: 4 +--- !u!114 &5443210462339960101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8139819142084880061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 28342e4845776bf5982ef6ad03926c37, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Turret + _bulletPrefab: {fileID: 2630910966893525057, guid: 73dab2e2f6b94fed1bca337e79ee22f4, type: 3} + _bulletSpawnPoint: {fileID: 0} + _reloadTime: 0.75 + _damage: 3 + _distance: 4 + _price: 400 + _sellingMultiplier: 0.5 + _upgrades: [] +--- !u!65 &539037596837637127 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8139819142084880061} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/TurretLvl3.prefab.meta b/Assets/Prefabs/TurretLvl3.prefab.meta new file mode 100644 index 0000000..cd8a29c --- /dev/null +++ b/Assets/Prefabs/TurretLvl3.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7f8c457702a3d234f9aa0ccae4d3ba84 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Island.unity b/Assets/Scenes/Island.unity index fb3e809..0bd3adc 100644 --- a/Assets/Scenes/Island.unity +++ b/Assets/Scenes/Island.unity @@ -10793,6 +10793,8 @@ MonoBehaviour: _icon: {fileID: 21300000, guid: 6dfa29c1d95915449b61fa6c240fb394, type: 3} - _turretPrefab: {fileID: 2907167170870464394, guid: 689e89eb7dad355439ed07acfd3b5d57, type: 3} _icon: {fileID: 0} + - _turretPrefab: {fileID: 5443210462339960101, guid: 7f8c457702a3d234f9aa0ccae4d3ba84, type: 3} + _icon: {fileID: 0} _onBlockSelected: m_PersistentCalls: m_Calls: []