diff --git a/Assets/Prefabs/Camera/Cinemachine.prefab b/Assets/Prefabs/Camera/Cinemachine.prefab index 916b750..ddf86cd 100644 --- a/Assets/Prefabs/Camera/Cinemachine.prefab +++ b/Assets/Prefabs/Camera/Cinemachine.prefab @@ -651,8 +651,8 @@ Camera: m_GameObject: {fileID: 6163557566655415017} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.735849, g: 0.6164398, b: 0.22630823, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -764,8 +764,8 @@ MonoBehaviour: m_UpdateMethod: 2 m_BlendUpdateMethod: 1 m_DefaultBlend: - m_Style: 1 - m_Time: 2 + m_Style: 3 + m_Time: 1 m_CustomCurve: serializedVersion: 2 m_Curve: [] diff --git a/Assets/Prefabs/Camera/TowerCam.prefab b/Assets/Prefabs/Camera/TowerCam.prefab index 724a013..fa33d21 100644 --- a/Assets/Prefabs/Camera/TowerCam.prefab +++ b/Assets/Prefabs/Camera/TowerCam.prefab @@ -586,7 +586,6 @@ GameObject: - component: {fileID: 6162594480593627889} - component: {fileID: 5831827090361496139} - component: {fileID: 1880671857495123661} - - component: {fileID: 6501708406546051540} m_Layer: 0 m_Name: TowerCam m_TagString: Untagged @@ -730,7 +729,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_gameObject: {fileID: 0} - newTarget: {fileID: 0} + originalOffset: 0 --- !u!114 &5831827090361496139 MonoBehaviour: m_ObjectHideFlags: 0 @@ -786,23 +785,3 @@ MonoBehaviour: m_Offset: {x: 0, y: 0, z: 0} m_ApplyAfter: 0 m_PreserveComposition: 0 ---- !u!114 &6501708406546051540 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7612880158138396871} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0aa8da13840a5cb43997aca17b09b15d, type: 3} - m_Name: - m_EditorClassIdentifier: - target: {fileID: 0} - origin: {fileID: 7612880158138396871} - towerCamScript: {fileID: 0} - hideFadeSpeed: 2 - showFadeSpeed: 7 - sphereRadius: 2 - sphereRange: 10 - sphereOffset: {x: 0, y: 2, z: 0} diff --git a/Assets/Prefabs/Enemies/GreenBoyJetpack.prefab b/Assets/Prefabs/Enemies/GreenBoyJetpack.prefab index f6006ca..511f765 100644 --- a/Assets/Prefabs/Enemies/GreenBoyJetpack.prefab +++ b/Assets/Prefabs/Enemies/GreenBoyJetpack.prefab @@ -28,7 +28,7 @@ Transform: m_GameObject: {fileID: 328181127392286608} serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0.054092992, y: -0.06743198, z: -0.402755} + m_LocalPosition: {x: -0.054092992, y: -0.06743198, z: 0.00022390485} m_LocalScale: {x: 55.62371, y: 55.62371, z: 55.62371} m_ConstrainProportionsScale: 0 m_Children: [] @@ -134,7 +134,7 @@ Transform: m_GameObject: {fileID: 1198457551814079549} serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: 0, y: 0, z: -0.40107602} + m_LocalPosition: {x: 0, y: 0, z: 0.0019028783} m_LocalScale: {x: 58.426834, y: 58.426834, z: 58.426834} m_ConstrainProportionsScale: 0 m_Children: [] @@ -240,7 +240,7 @@ Transform: m_GameObject: {fileID: 8635889218845086774} serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: 0, y: 0, z: -0.4029789} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Prefabs/Paths/GroundPath.prefab b/Assets/Prefabs/Paths/GroundPath.prefab index 0398657..f5345ac 100644 --- a/Assets/Prefabs/Paths/GroundPath.prefab +++ b/Assets/Prefabs/Paths/GroundPath.prefab @@ -25,7 +25,7 @@ Transform: m_GameObject: {fileID: 330280530189297080} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.29, y: 0.76, z: -3.3000002} + m_LocalPosition: {x: -1.125, y: 0.76, z: -3.375} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -56,7 +56,7 @@ Transform: m_GameObject: {fileID: 525977634642021262} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.54, y: 0.76, z: -1.3000002} + m_LocalPosition: {x: -3.375, y: 0.76, z: -1.125} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -87,7 +87,7 @@ Transform: m_GameObject: {fileID: 1543659589121210415} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.54, y: 0.76, z: 3.4499998} + m_LocalPosition: {x: -3.375, y: 0.76, z: 3.25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -118,7 +118,7 @@ Transform: m_GameObject: {fileID: 3487098836263653193} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.29, y: 0.76, z: 3.4499998} + m_LocalPosition: {x: -1.125, y: 0.76, z: 3.25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -149,7 +149,7 @@ Transform: m_GameObject: {fileID: 3489449738675045651} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.21, y: 0.76, z: -0.25} + m_LocalPosition: {x: 4.375, y: 0.76, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -180,7 +180,7 @@ Transform: m_GameObject: {fileID: 4144679491042648141} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.96, y: 0.76, z: 2.1999998} + m_LocalPosition: {x: 2.125, y: 0.76, z: 2.125} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -242,7 +242,7 @@ Transform: m_GameObject: {fileID: 6768891002692047968} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.96, y: 0.76, z: -3.3000002} + m_LocalPosition: {x: 2.125, y: 0.76, z: -3.375} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -273,7 +273,7 @@ Transform: m_GameObject: {fileID: 7332061776314564640} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.21, y: 0.76, z: -0.25} + m_LocalPosition: {x: 7.875, y: 0.76, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -304,7 +304,7 @@ Transform: m_GameObject: {fileID: 7365176094828002273} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.21, y: 0.76, z: 2.1999998} + m_LocalPosition: {x: 4.375, y: 0.76, z: 2.125} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -403,7 +403,7 @@ Transform: m_GameObject: {fileID: 7525883537600548486} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.5, y: 0.76, z: -1.3000002} + m_LocalPosition: {x: -6.5, y: 0.76, z: -1.125} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Prefabs/Paths/SkyPath.prefab b/Assets/Prefabs/Paths/SkyPath.prefab index edb8dea..7cc3f43 100644 --- a/Assets/Prefabs/Paths/SkyPath.prefab +++ b/Assets/Prefabs/Paths/SkyPath.prefab @@ -122,7 +122,7 @@ Transform: m_GameObject: {fileID: 2631744247312081611} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.375, y: 0.5, z: -1.125} + m_LocalPosition: {x: -3.375, y: 0.75, z: -1.125} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -184,7 +184,7 @@ Transform: m_GameObject: {fileID: 5690493490326020338} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.625, y: 0.5, z: -1.125} + m_LocalPosition: {x: -7.625, y: 0.75, z: -1.125} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 9759881..3ffe9ae 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18029143, g: 0.22572419, b: 0.30693057, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -233,6 +233,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 66896262} m_PrefabAsset: {fileID: 0} +--- !u!21 &69918180 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, 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: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} + m_BuildTextureStacks: [] --- !u!21 &129310422 Material: serializedVersion: 8 @@ -1364,6 +1405,88 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &752683995 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, 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: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + m_BuildTextureStacks: [] +--- !u!21 &763929715 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, 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: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + m_BuildTextureStacks: [] --- !u!1 &779612215 GameObject: m_ObjectHideFlags: 0 @@ -1733,26 +1856,6 @@ PrefabInstance: propertyPath: m_LocalRotation.x value: 0.021683881 objectReference: {fileID: 0} - - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - type: 3} - propertyPath: m_ClearFlags - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - type: 3} - propertyPath: m_BackGroundColor.b - value: 0.22630823 - objectReference: {fileID: 0} - - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - type: 3} - propertyPath: m_BackGroundColor.g - value: 0.6164398 - objectReference: {fileID: 0} - - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - type: 3} - propertyPath: m_BackGroundColor.r - value: 0.735849 - objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w @@ -1773,16 +1876,6 @@ PrefabInstance: propertyPath: m_LocalRotation.x value: 0.024118524 objectReference: {fileID: 0} - - target: {fileID: 7847799551035619544, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - type: 3} - propertyPath: m_DefaultBlend.m_Time - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7847799551035619544, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - type: 3} - propertyPath: m_DefaultBlend.m_Style - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8510394576666186474, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: towerCam @@ -1843,12 +1936,47 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} ---- !u!1 &949771675 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6163557566655415017, guid: fd9f9b61c0ebb324ebc9f929e26706bc, - type: 3} - m_PrefabInstance: {fileID: 929277189} +--- !u!21 &952890291 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, 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: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} + m_BuildTextureStacks: [] --- !u!1 &968288134 GameObject: m_ObjectHideFlags: 0 @@ -1970,6 +2098,47 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9d875dda41d470948bbe6fd408a7e835, type: 3} +--- !u!21 &1012044211 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, 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: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1001 &1016399493 PrefabInstance: m_ObjectHideFlags: 0 @@ -2284,6 +2453,47 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1211328792} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &1253675260 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, 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: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} + - _r: {r: 30.96, g: 0, b: 0, a: 0} + - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} + m_BuildTextureStacks: [] --- !u!21 &1304927327 Material: serializedVersion: 8 @@ -3239,6 +3449,47 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: TargetCarveGrid: {fileID: 1812668202} +--- !u!21 &2061736992 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, 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: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!1001 &2074753046 PrefabInstance: m_ObjectHideFlags: 0 @@ -3297,23 +3548,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6501708406546051540, guid: 1c668d8e87e6aee4a8527281f0b61954, - type: 3} - propertyPath: origin - value: - objectReference: {fileID: 949771675} - - target: {fileID: 6501708406546051540, guid: 1c668d8e87e6aee4a8527281f0b61954, - type: 3} - propertyPath: towerCamScript - value: - objectReference: {fileID: 1346132657} - target: {fileID: 7612880158138396871, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3} propertyPath: m_Name value: TowerCam objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 6501708406546051540, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -3422,6 +3662,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2098922850} m_PrefabAsset: {fileID: 0} +--- !u!21 &2132777435 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, 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: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 360, g: 550, b: 0, a: 0} + - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} + - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} + m_BuildTextureStacks: [] --- !u!1001 &1982784166430990024 PrefabInstance: m_ObjectHideFlags: 0 @@ -3430,46 +3711,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 987596884297488772, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.375 - objectReference: {fileID: 0} - - target: {fileID: 987596884297488772, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1105341062220460822, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.x - value: 2.125 - objectReference: {fileID: 0} - - target: {fileID: 1105341062220460822, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: 2.125 - objectReference: {fileID: 0} - - target: {fileID: 1755882387827754636, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.x - value: 7.875 - objectReference: {fileID: 0} - - target: {fileID: 1755882387827754636, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2371292727203336024, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.x - value: -3.375 - objectReference: {fileID: 0} - - target: {fileID: 2371292727203336024, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.125 - objectReference: {fileID: 0} - target: {fileID: 4296081756590912317, guid: 702da2f24ca5bff409259010da742df1, type: 3} propertyPath: m_LocalPosition.x @@ -3520,66 +3761,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4385823141841843282, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.x - value: -1.125 - objectReference: {fileID: 0} - - target: {fileID: 4385823141841843282, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: 3.25 - objectReference: {fileID: 0} - - target: {fileID: 4518157500397519598, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.x - value: -1.125 - objectReference: {fileID: 0} - - target: {fileID: 4518157500397519598, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: -3.375 - objectReference: {fileID: 0} - - target: {fileID: 5664078251046624944, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.125 - objectReference: {fileID: 0} - - target: {fileID: 5984414381206481626, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.x - value: -3.375 - objectReference: {fileID: 0} - - target: {fileID: 5984414381206481626, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: 3.25 - objectReference: {fileID: 0} - - target: {fileID: 6457795451717270032, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.x - value: 2.125 - objectReference: {fileID: 0} - - target: {fileID: 6457795451717270032, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: -3.375 - objectReference: {fileID: 0} - target: {fileID: 7486216449678048693, guid: 702da2f24ca5bff409259010da742df1, type: 3} propertyPath: m_Name value: GroundPath objectReference: {fileID: 0} - - target: {fileID: 8118687754024032127, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.375 - objectReference: {fileID: 0} - - target: {fileID: 8118687754024032127, guid: 702da2f24ca5bff409259010da742df1, - type: 3} - propertyPath: m_LocalPosition.z - value: 2.125 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3648,11 +3834,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4274405463174037481, guid: 04b33788ffcc15e4e8f74ae3b8d95dc3, - type: 3} - propertyPath: WaypointRadiusTolerence - value: 0.1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3671,6 +3852,26 @@ PrefabInstance: propertyPath: m_Name value: Canvas objectReference: {fileID: 0} + - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1230386429136411041, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Camera @@ -3791,6 +3992,26 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 371816795} + - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3990110949884708462, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material @@ -3801,11 +4022,71 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 1304927327} + - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4992629952180980787, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: objectReference: {fileID: 490438992} + - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8443057073470027503, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material diff --git a/Assets/ScriptableObjects/EnemyCollection.asset b/Assets/ScriptableObjects/EnemyCollection.asset index 969b417..843a093 100644 --- a/Assets/ScriptableObjects/EnemyCollection.asset +++ b/Assets/ScriptableObjects/EnemyCollection.asset @@ -27,7 +27,7 @@ MonoBehaviour: - name: moveSpeed: 4 FlyPath: 1 - feetOffset: 0.7 + feetOffset: 0 prefab: {fileID: 4537037150239815062, guid: 5a35ef73a064d664cbaf53a719468025, type: 3} - name: diff --git a/Assets/ScriptableObjects/Levels/Level1.asset b/Assets/ScriptableObjects/Levels/Level1.asset index d6f0378..55cc3cb 100644 --- a/Assets/ScriptableObjects/Levels/Level1.asset +++ b/Assets/ScriptableObjects/Levels/Level1.asset @@ -13,14 +13,14 @@ MonoBehaviour: m_Name: Level1 m_EditorClassIdentifier: Waves: - - spawnTime: 5 + - spawnTime: 0 groups: - enemyIndex: 0 num: 10 spawnInterval: 1 - - enemyIndex: 1 + - enemyIndex: 2 num: 2 - spawnInterval: 2 + spawnInterval: 0 - spawnTime: 5 groups: - enemyIndex: 0 diff --git a/Assets/Scripts/Manager/WaypointPath.cs b/Assets/Scripts/Manager/WaypointPath.cs index 474e8fb..7a1e51c 100644 --- a/Assets/Scripts/Manager/WaypointPath.cs +++ b/Assets/Scripts/Manager/WaypointPath.cs @@ -53,7 +53,6 @@ public class WaypointPath : MonoBehaviour float minDist = Math.Min(dist, data.MoveSpeed * Time.deltaTime); data.Entity.position += normTargetDir * minDist; - data.Entity.position = data.Entity.position.With(y: data.FeetOffset); } }