From 1d50bca71575bd19a541ad0d02d7575778b50531 Mon Sep 17 00:00:00 2001 From: Fahad Sheikh Date: Thu, 14 May 2020 22:25:58 +0530 Subject: [PATCH 1/3] Added barrel and catapult --- Assets/Geometry.meta | 8 + Assets/Geometry/barrel FBX12.fbx | 3 + Assets/Geometry/barrel FBX12.fbx.meta | 96 ++++ Assets/Geometry/catapult1.fbx | 3 + Assets/Geometry/catapult1.fbx.meta | 96 ++++ ...l-texture-planks-rings-wooden-63557111.mat | 77 ++++ ...ture-planks-rings-wooden-63557111.mat.meta | 8 + Assets/Prefabs/Environment.meta | 8 + Assets/Prefabs/Environment/Barrel.prefab | 82 ++++ Assets/Prefabs/Environment/Barrel.prefab.meta | 7 + Assets/Prefabs/Environment/Catapult.prefab | 194 ++++++++ .../Prefabs/Environment/Catapult.prefab.meta | 7 + Assets/Prefabs/Towers/GreenTower.prefab | 75 +++ Assets/Scenes/MainScene.unity | 2 +- Assets/Scenes/SampleScene.unity | 436 ++++++++++++++++++ Assets/Scenes/SampleScene.unity.meta | 7 + ...l-texture-planks-rings-wooden-63557111.jpg | 3 + ...ture-planks-rings-wooden-63557111.jpg.meta | 92 ++++ Assets/barrel.unity | 298 ++++++++++++ Assets/barrel.unity.meta | 7 + 20 files changed, 1508 insertions(+), 1 deletion(-) create mode 100644 Assets/Geometry.meta create mode 100644 Assets/Geometry/barrel FBX12.fbx create mode 100644 Assets/Geometry/barrel FBX12.fbx.meta create mode 100644 Assets/Geometry/catapult1.fbx create mode 100644 Assets/Geometry/catapult1.fbx.meta create mode 100644 Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat create mode 100644 Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat.meta create mode 100644 Assets/Prefabs/Environment.meta create mode 100644 Assets/Prefabs/Environment/Barrel.prefab create mode 100644 Assets/Prefabs/Environment/Barrel.prefab.meta create mode 100644 Assets/Prefabs/Environment/Catapult.prefab create mode 100644 Assets/Prefabs/Environment/Catapult.prefab.meta create mode 100644 Assets/Scenes/SampleScene.unity create mode 100644 Assets/Scenes/SampleScene.unity.meta create mode 100644 Assets/Textures/barrel-texture-planks-rings-wooden-63557111.jpg create mode 100644 Assets/Textures/barrel-texture-planks-rings-wooden-63557111.jpg.meta create mode 100644 Assets/barrel.unity create mode 100644 Assets/barrel.unity.meta diff --git a/Assets/Geometry.meta b/Assets/Geometry.meta new file mode 100644 index 0000000..786361f --- /dev/null +++ b/Assets/Geometry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 762eedff730bd4e46bba3be88aa7a518 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Geometry/barrel FBX12.fbx b/Assets/Geometry/barrel FBX12.fbx new file mode 100644 index 0000000..f622536 --- /dev/null +++ b/Assets/Geometry/barrel FBX12.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6de5b980dee143890e477fe5a74fae646859e5435ae0e26879eca3c3f34398f2 +size 174396844 diff --git a/Assets/Geometry/barrel FBX12.fbx.meta b/Assets/Geometry/barrel FBX12.fbx.meta new file mode 100644 index 0000000..10722e5 --- /dev/null +++ b/Assets/Geometry/barrel FBX12.fbx.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 6af76d362bf2d744fa78ef8088e313e4 +ModelImporter: + serializedVersion: 19300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 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 + 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 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Geometry/catapult1.fbx b/Assets/Geometry/catapult1.fbx new file mode 100644 index 0000000..76fa9aa --- /dev/null +++ b/Assets/Geometry/catapult1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5372f96f6a0e4b3b140f7e63401ac42ba2296bc3b6a20dfded01896dbbe7a56 +size 3308284 diff --git a/Assets/Geometry/catapult1.fbx.meta b/Assets/Geometry/catapult1.fbx.meta new file mode 100644 index 0000000..be48a91 --- /dev/null +++ b/Assets/Geometry/catapult1.fbx.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 2fe76be50fcf31a4f97638275e71ece2 +ModelImporter: + serializedVersion: 19300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 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 + 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 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat b/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat new file mode 100644 index 0000000..0ddf4d6 --- /dev/null +++ b/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.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: barrel-texture-planks-rings-wooden-63557111 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + 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: 2800000, guid: a3b68a99e95116d4ba65f10c2a745c6f, 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} + 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: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat.meta b/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat.meta new file mode 100644 index 0000000..9dfadf1 --- /dev/null +++ b/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 688e73b17f5d0284880b722cb6b63eb8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Environment.meta b/Assets/Prefabs/Environment.meta new file mode 100644 index 0000000..3e2eb91 --- /dev/null +++ b/Assets/Prefabs/Environment.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d67a6bbe2b73f6b48abba8153d955c1a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Environment/Barrel.prefab b/Assets/Prefabs/Environment/Barrel.prefab new file mode 100644 index 0000000..df2b7d2 --- /dev/null +++ b/Assets/Prefabs/Environment/Barrel.prefab @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5951486267733696227 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7263379184053333232} + - component: {fileID: 1844138687361193670} + - component: {fileID: 5380459286637046335} + m_Layer: 0 + m_Name: Barrel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7263379184053333232 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5951486267733696227} + m_LocalRotation: {x: 0.00000008146035, y: -0.00000004371139, z: 3.6219773e-15, w: 1} + m_LocalPosition: {x: 0.88154984, y: 0.8603318, z: -1.8059194} + m_LocalScale: {x: 155.58719, y: 155.58719, z: 155.58719} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1844138687361193670 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5951486267733696227} + m_Mesh: {fileID: -1465998787520644820, guid: 6af76d362bf2d744fa78ef8088e313e4, type: 3} +--- !u!23 &5380459286637046335 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5951486267733696227} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -3846018093981099296, guid: 6af76d362bf2d744fa78ef8088e313e4, type: 3} + - {fileID: -6478536213147159724, guid: 6af76d362bf2d744fa78ef8088e313e4, type: 3} + 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 diff --git a/Assets/Prefabs/Environment/Barrel.prefab.meta b/Assets/Prefabs/Environment/Barrel.prefab.meta new file mode 100644 index 0000000..0e661f2 --- /dev/null +++ b/Assets/Prefabs/Environment/Barrel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: deb1d5ec0798dfd4f86c3b7eec1235bd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Environment/Catapult.prefab b/Assets/Prefabs/Environment/Catapult.prefab new file mode 100644 index 0000000..dae9189 --- /dev/null +++ b/Assets/Prefabs/Environment/Catapult.prefab @@ -0,0 +1,194 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1127059221632372024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5328103497506480522} + - component: {fileID: 5683445188052526388} + - component: {fileID: 7403576928324268667} + m_Layer: 13 + m_Name: Sphere.007_Sphere.034 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5328103497506480522 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127059221632372024} + m_LocalRotation: {x: 0.00000008146035, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 3.0930386, y: -0.73994106, z: -0.48036143} + m_LocalScale: {x: 55.281956, y: 55.281956, z: 55.281956} + m_Children: [] + m_Father: {fileID: 5579455031680490297} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5683445188052526388 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127059221632372024} + m_Mesh: {fileID: 6504198869750476443, guid: 2fe76be50fcf31a4f97638275e71ece2, type: 3} +--- !u!23 &7403576928324268667 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127059221632372024} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1d7c833c0b3816743aaf7421e10b23c6, 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 +--- !u!1 &8878122167393462570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5579455031680490297} + m_Layer: 13 + m_Name: Catapult + m_TagString: Tower + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5579455031680490297 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8878122167393462570} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.64567, y: 0.64567, z: 0.64567} + m_Children: + - {fileID: 8977547874903607044} + - {fileID: 5328103497506480522} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &9134957290911559382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8977547874903607044} + - component: {fileID: 6516655660529074917} + - component: {fileID: 9128946745555621936} + m_Layer: 13 + m_Name: Plane.006_Plane.014 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8977547874903607044 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9134957290911559382} + m_LocalRotation: {x: 0.00000008146035, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 76.04735, y: 76.04735, z: 76.04735} + m_Children: [] + m_Father: {fileID: 5579455031680490297} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6516655660529074917 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9134957290911559382} + m_Mesh: {fileID: -2833932372280351438, guid: 2fe76be50fcf31a4f97638275e71ece2, type: 3} +--- !u!23 &9128946745555621936 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9134957290911559382} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1d7c833c0b3816743aaf7421e10b23c6, type: 2} + - {fileID: -5605289326131794027, guid: 2fe76be50fcf31a4f97638275e71ece2, type: 3} + - {fileID: 2100000, guid: 1d7c833c0b3816743aaf7421e10b23c6, 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 diff --git a/Assets/Prefabs/Environment/Catapult.prefab.meta b/Assets/Prefabs/Environment/Catapult.prefab.meta new file mode 100644 index 0000000..587c431 --- /dev/null +++ b/Assets/Prefabs/Environment/Catapult.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: edb0c64a6d6f9f644a34ebc1bc0cdc00 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Towers/GreenTower.prefab b/Assets/Prefabs/Towers/GreenTower.prefab index be7061c..780cbc8 100644 --- a/Assets/Prefabs/Towers/GreenTower.prefab +++ b/Assets/Prefabs/Towers/GreenTower.prefab @@ -1,5 +1,74 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1001 &370069033199302288 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3110061222093292653} + m_Modifications: + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8878122167393462570, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_Name + value: catapult1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, type: 3} --- !u!1001 &5073874566854477156 PrefabInstance: m_ObjectHideFlags: 0 @@ -154,3 +223,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3f33bd9d6e48cf43a6c01ebb8060a3f, type: 3} +--- !u!4 &3110061222093292653 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7873187413585461513, guid: c3f33bd9d6e48cf43a6c01ebb8060a3f, + type: 3} + m_PrefabInstance: {fileID: 5073874566854477156} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 8f3180e..622acb9 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -99,7 +99,7 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: dcae720768c0bce4ba046a04029bda70, type: 2} - m_UseShadowmask: 1 + m_UseShadowmask: 0 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity new file mode 100644 index 0000000..4165395 --- /dev/null +++ b/Assets/Scenes/SampleScene.unity @@ -0,0 +1,436 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 705507994} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 0 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &705507993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 705507995} + - component: {fileID: 705507994} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &705507994 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &705507995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &963194225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963194228} + - component: {fileID: 963194227} + - component: {fileID: 963194226} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &963194226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 +--- !u!20 &963194227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &963194228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &6468507679709803486 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5951486267733696227, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_Name + value: barrel FBX12 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.88154984 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.8603318 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.8059194 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000008146035 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000004371139 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalRotation.z + value: 3.6219773e-15 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, type: 3} +--- !u!1001 &9021120977562099215 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.268637 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.18655396 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.8894844 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5579455031680490297, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8878122167393462570, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, + type: 3} + propertyPath: m_Name + value: catapult1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: edb0c64a6d6f9f644a34ebc1bc0cdc00, type: 3} diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/SampleScene.unity.meta new file mode 100644 index 0000000..952bd1e --- /dev/null +++ b/Assets/Scenes/SampleScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9fc0d4010bbf28b4594072e72b8655ab +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/barrel-texture-planks-rings-wooden-63557111.jpg b/Assets/Textures/barrel-texture-planks-rings-wooden-63557111.jpg new file mode 100644 index 0000000..939ea61 --- /dev/null +++ b/Assets/Textures/barrel-texture-planks-rings-wooden-63557111.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1455f952005ce65694b3a7823574a4b414890044b3d6b39038102380489d6709 +size 316204 diff --git a/Assets/Textures/barrel-texture-planks-rings-wooden-63557111.jpg.meta b/Assets/Textures/barrel-texture-planks-rings-wooden-63557111.jpg.meta new file mode 100644 index 0000000..34f34bb --- /dev/null +++ b/Assets/Textures/barrel-texture-planks-rings-wooden-63557111.jpg.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a3b68a99e95116d4ba65f10c2a745c6f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/barrel.unity b/Assets/barrel.unity new file mode 100644 index 0000000..52f0c28 --- /dev/null +++ b/Assets/barrel.unity @@ -0,0 +1,298 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 705507994} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &705507993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 705507995} + - component: {fileID: 705507994} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &705507994 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &705507995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &963194225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963194228} + - component: {fileID: 963194227} + - component: {fileID: 963194226} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &963194226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 +--- !u!20 &963194227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &963194228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/barrel.unity.meta b/Assets/barrel.unity.meta new file mode 100644 index 0000000..8784ffe --- /dev/null +++ b/Assets/barrel.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 350a632fc0fce724da311b3b5dccdfb6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From cba7a0ef3b33210c817b1a99c0d090e5e44456d2 Mon Sep 17 00:00:00 2001 From: sps1112 <62471966+sps1112@users.noreply.github.com> Date: Tue, 19 May 2020 19:57:38 +0530 Subject: [PATCH 2/3] add wallet and dialog tests --- Assets/Tests/PlayMode/UI/DialogTests.cs | 52 ++++++++++++++++++++++- Assets/Tests/PlayMode/UI/WalletUITests.cs | 29 ++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/Assets/Tests/PlayMode/UI/DialogTests.cs b/Assets/Tests/PlayMode/UI/DialogTests.cs index 4b2eecf..1ce92a9 100644 --- a/Assets/Tests/PlayMode/UI/DialogTests.cs +++ b/Assets/Tests/PlayMode/UI/DialogTests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; namespace Tests.UI { @@ -18,9 +19,58 @@ public void Setup() } [UnityTest] - public IEnumerator CanCreateUpgradeUIMenu() + public IEnumerator UIShowsUpOnMoveClick() { + TDEvent showMoveDialog = EventRegistry.GetEvent("showMoveDialog"); + showMoveDialog.Invoke(ETowerType.Base); + GameObject dialogBox = GameObject.Find("UIManager").transform.Find("WalletUI/Dialog").gameObject; yield return null; + Assert.True(dialogBox.activeSelf); + } + + [UnityTest] + public IEnumerator UIShowsUpOnUpgradeClick() + { + TDEvent showUpgradeDialog = EventRegistry.GetEvent("showUpgradeDialog"); + showUpgradeDialog.Invoke(ETowerType.Base); + GameObject dialogBox = GameObject.Find("UIManager").transform.Find("WalletUI/Dialog").gameObject; + yield return null; + Assert.True(dialogBox.activeSelf); + } + + [UnityTest] + public IEnumerator UIGoesAwayOnOKClick() + { + TDEvent showMoveDialog = EventRegistry.GetEvent("showMoveDialog"); + showMoveDialog.Invoke(ETowerType.Base); + GameObject dialogBox = GameObject.Find("UIManager").transform.Find("WalletUI/Dialog").gameObject; + yield return null; + dialogBox.GetComponent().OKClicked(); + yield return null; + Assert.False(dialogBox.activeSelf); + } + + [UnityTest] + public IEnumerator UIGoesAwayOnCancelClick() + { + TDEvent showMoveDialog = EventRegistry.GetEvent("showMoveDialog"); + showMoveDialog.Invoke(ETowerType.Base); + GameObject dialogBox = GameObject.Find("UIManager").transform.Find("WalletUI/Dialog").gameObject; + yield return null; + dialogBox.GetComponent().CancelClicked(); + yield return null; + Assert.False(dialogBox.activeSelf); + } + + [UnityTest] + public IEnumerator UIButtonTextDependsOnConfig() + { + TDEvent showMoveDialog = EventRegistry.GetEvent("showMoveDialog"); + showMoveDialog.Invoke(ETowerType.Base); + GameObject dialogBox = GameObject.Find("UIManager").transform.Find("WalletUI/Dialog").gameObject; + GameObject okButtonText = dialogBox.transform.Find("OKButton/Text").gameObject; + yield return null; + Assert.AreEqual("Move", okButtonText.GetComponent().text); } } } diff --git a/Assets/Tests/PlayMode/UI/WalletUITests.cs b/Assets/Tests/PlayMode/UI/WalletUITests.cs index f7788d3..ce88679 100644 --- a/Assets/Tests/PlayMode/UI/WalletUITests.cs +++ b/Assets/Tests/PlayMode/UI/WalletUITests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; namespace Tests.UI { @@ -18,9 +19,35 @@ public void Setup() } [UnityTest] - public IEnumerator CanCreateUpgradeUIMenu() + public IEnumerator DisplaysCurrentCash() { + GameObject walletUI = GameObject.Find("UIManager").transform.Find("WalletUI").gameObject; + GameObject cashText = walletUI.transform.Find("WalletBG/Cash").gameObject; yield return null; + Assert.AreEqual("$ " + GameState.CurrentCash, cashText.GetComponent().text); + } + + [UnityTest] + public IEnumerator CashUICanChange() + { + GameObject walletUI = GameObject.Find("UIManager").transform.Find("WalletUI").gameObject; + GameObject cashText = walletUI.transform.Find("WalletBG/Cash").gameObject; + string originalText = cashText.GetComponent().text; + GameState.CurrentCash -= 1; + yield return null; + Assert.AreNotEqual(originalText, cashText.GetComponent().text); + } + + [UnityTest] + public IEnumerator CashDeductedUponAction() + { + GameObject walletUI = GameObject.Find("UIManager").transform.Find("WalletUI").gameObject; + int originalCash = GameState.CurrentCash; + TDEvent showMoveDialog = EventRegistry.GetEvent("showMoveDialog"); + showMoveDialog.Invoke(ETowerType.Base); + walletUI.GetComponent().OnOKClickMove(); + yield return null; + Assert.AreNotEqual(originalCash, GameState.CurrentCash); } } } From 408bba3459b075c636d9daeaa2805b2ded693636 Mon Sep 17 00:00:00 2001 From: sps1112 <62471966+sps1112@users.noreply.github.com> Date: Thu, 21 May 2020 19:16:09 +0530 Subject: [PATCH 3/3] add barrel and catapult improvements --- Assets/Geometry/barrel FBX12.fbx.meta | 14 +++- Assets/Geometry/catapult1.fbx.meta | 24 +++++- ...l-texture-planks-rings-wooden-63557111.mat | 39 +++++++++- Assets/Prefabs/Environment/Barrel.prefab | 6 +- Assets/Prefabs/Environment/Catapult.prefab | 37 ++++++++- Assets/Prefabs/Towers/GreenTower.prefab | 5 ++ Assets/Scenes/MainScene.unity | 75 ++++++++++++++++++- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/QualitySettings.asset | 3 +- 9 files changed, 190 insertions(+), 17 deletions(-) diff --git a/Assets/Geometry/barrel FBX12.fbx.meta b/Assets/Geometry/barrel FBX12.fbx.meta index 10722e5..4afc8f0 100644 --- a/Assets/Geometry/barrel FBX12.fbx.meta +++ b/Assets/Geometry/barrel FBX12.fbx.meta @@ -3,7 +3,19 @@ guid: 6af76d362bf2d744fa78ef8088e313e4 ModelImporter: serializedVersion: 19300 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material.001 + second: {fileID: -6478536213147159724, guid: 6af76d362bf2d744fa78ef8088e313e4, + type: 3} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material.002 + second: {fileID: -3846018093981099296, guid: 6af76d362bf2d744fa78ef8088e313e4, + type: 3} materials: materialImportMode: 1 materialName: 0 diff --git a/Assets/Geometry/catapult1.fbx.meta b/Assets/Geometry/catapult1.fbx.meta index be48a91..1f2997e 100644 --- a/Assets/Geometry/catapult1.fbx.meta +++ b/Assets/Geometry/catapult1.fbx.meta @@ -3,7 +3,29 @@ guid: 2fe76be50fcf31a4f97638275e71ece2 ModelImporter: serializedVersion: 19300 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material.016 + second: {fileID: 637949407474519127, guid: 2fe76be50fcf31a4f97638275e71ece2, type: 3} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material.017 + second: {fileID: 99656467281103303, guid: 2fe76be50fcf31a4f97638275e71ece2, type: 3} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material.018 + second: {fileID: -5605289326131794027, guid: 2fe76be50fcf31a4f97638275e71ece2, + type: 3} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material.019 + second: {fileID: -4246479402191905792, guid: 2fe76be50fcf31a4f97638275e71ece2, + type: 3} materials: materialImportMode: 1 materialName: 0 diff --git a/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat b/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat index 0ddf4d6..4888f89 100644 --- a/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat +++ b/Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat @@ -8,17 +8,22 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: barrel-texture-planks-rings-wooden-63557111 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: a3b68a99e95116d4ba65f10c2a745c6f, 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} @@ -55,11 +60,19 @@ Material: 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} m_Floats: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,11 +80,31 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 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.2, g: 0.2, b: 0.2, a: 1} +--- !u!114 &81488983525824564 +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: + version: 1 diff --git a/Assets/Prefabs/Environment/Barrel.prefab b/Assets/Prefabs/Environment/Barrel.prefab index df2b7d2..d8e205c 100644 --- a/Assets/Prefabs/Environment/Barrel.prefab +++ b/Assets/Prefabs/Environment/Barrel.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 5951486267733696227} m_LocalRotation: {x: 0.00000008146035, y: -0.00000004371139, z: 3.6219773e-15, w: 1} m_LocalPosition: {x: 0.88154984, y: 0.8603318, z: -1.8059194} - m_LocalScale: {x: 155.58719, y: 155.58719, z: 155.58719} + m_LocalScale: {x: 50, y: 50, z: 50} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -58,8 +58,8 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -3846018093981099296, guid: 6af76d362bf2d744fa78ef8088e313e4, type: 3} - - {fileID: -6478536213147159724, guid: 6af76d362bf2d744fa78ef8088e313e4, type: 3} + - {fileID: 2100000, guid: 688e73b17f5d0284880b722cb6b63eb8, type: 2} + - {fileID: 2100000, guid: 688e73b17f5d0284880b722cb6b63eb8, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Environment/Catapult.prefab b/Assets/Prefabs/Environment/Catapult.prefab index dae9189..c60c74c 100644 --- a/Assets/Prefabs/Environment/Catapult.prefab +++ b/Assets/Prefabs/Environment/Catapult.prefab @@ -58,7 +58,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1d7c833c0b3816743aaf7421e10b23c6, type: 2} + - {fileID: 2100000, guid: 1b3d36a23fb7ac04a825f2b8cf83dcf6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -88,6 +88,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5579455031680490297} + - component: {fileID: 6948062214770093368} + - component: {fileID: 8889576105716923936} m_Layer: 13 m_Name: Catapult m_TagString: Tower @@ -111,6 +113,35 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &6948062214770093368 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8878122167393462570} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!65 &8889576105716923936 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8878122167393462570} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 4.240714, y: 5.311567, z: 4.5255833} + m_Center: {x: 0.27929392, y: 2.5826719, z: 0.5449075} --- !u!1 &9134957290911559382 GameObject: m_ObjectHideFlags: 0 @@ -169,9 +200,9 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: + - {fileID: 2100000, guid: 688e73b17f5d0284880b722cb6b63eb8, type: 2} - {fileID: 2100000, guid: 1d7c833c0b3816743aaf7421e10b23c6, type: 2} - - {fileID: -5605289326131794027, guid: 2fe76be50fcf31a4f97638275e71ece2, type: 3} - - {fileID: 2100000, guid: 1d7c833c0b3816743aaf7421e10b23c6, type: 2} + - {fileID: 2100000, guid: 1b3d36a23fb7ac04a825f2b8cf83dcf6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Towers/GreenTower.prefab b/Assets/Prefabs/Towers/GreenTower.prefab index 859f90d..a195aa7 100644 --- a/Assets/Prefabs/Towers/GreenTower.prefab +++ b/Assets/Prefabs/Towers/GreenTower.prefab @@ -191,6 +191,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6309608940614754484, guid: c3f33bd9d6e48cf43a6c01ebb8060a3f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6309608941005708838, guid: c3f33bd9d6e48cf43a6c01ebb8060a3f, type: 3} propertyPath: m_Materials.Array.data[0] diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 622acb9..1653e3f 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -99,7 +99,7 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: dcae720768c0bce4ba046a04029bda70, type: 2} - m_UseShadowmask: 0 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -122,6 +122,75 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 23800000, guid: 094e3f4313ce55945a8c7d77fa522b8b, type: 2} +--- !u!1001 &831797858 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5951486267733696227, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_Name + value: Barrel + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.882 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.038 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.952 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000008146035 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000004371139 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalRotation.z + value: 3.6219773e-15 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7263379184053333232, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: deb1d5ec0798dfd4f86c3b7eec1235bd, type: 3} --- !u!1 &838470604 GameObject: m_ObjectHideFlags: 0 @@ -268,9 +337,9 @@ GameObject: - component: {fileID: 1337933912} - component: {fileID: 1337933911} - component: {fileID: 1337933910} - m_Layer: 14 + m_Layer: 0 m_Name: Cube - m_TagString: Base + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 8 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index f04fc72..2873a29 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.2f1 -m_EditorVersionWithRevision: 2019.3.2f1 (c46a3a38511e) +m_EditorVersion: 2019.3.9f1 +m_EditorVersionWithRevision: 2019.3.9f1 (e6e740a1c473) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index b38e404..47609e9 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -220,7 +220,8 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} + customRenderPipeline: {fileID: 11400000, guid: 91d0b38a323226746964294839361ea1, + type: 2} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2