diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index bf72a4f..bdd7a66 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -515,6 +515,47 @@ Material: - _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 &265070096 +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!1 &280779768 GameObject: m_ObjectHideFlags: 0 @@ -751,47 +792,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &344706649 -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!1001 &359510068 PrefabInstance: m_ObjectHideFlags: 0 @@ -937,7 +937,7 @@ Material: - _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!21 &552210252 +--- !u!21 &494872442 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1096,47 +1096,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &898760272 -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 &922758185 GameObject: m_ObjectHideFlags: 0 @@ -1778,7 +1737,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1016399493} m_PrefabAsset: {fileID: 0} ---- !u!21 &1026789633 +--- !u!21 &1098436319 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1815,50 +1774,9 @@ Material: - _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!21 &1082681661 -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} + - _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 &1164447743 Material: @@ -1942,47 +1860,6 @@ Material: - _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 &1342574748 -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!114 &1346132657 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954, @@ -2036,6 +1913,47 @@ Material: - _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!21 &1501320188 +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!1 &1515922344 GameObject: m_ObjectHideFlags: 0 @@ -2172,6 +2090,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1554436711} m_PrefabAsset: {fileID: 0} +--- !u!21 &1624304924 +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!21 &1671723125 Material: serializedVersion: 8 @@ -2337,47 +2296,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 203396308} m_PrefabAsset: {fileID: 0} ---- !u!21 &1817645069 -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!1 &1902554698 GameObject: m_ObjectHideFlags: 0 @@ -2496,7 +2414,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &1982688566 +--- !u!21 &2003428257 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2533,9 +2451,91 @@ Material: - _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} + - _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!21 &2041862586 +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!21 &2057343428 +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!1001 &2074753046 PrefabInstance: @@ -2600,6 +2600,11 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 3685285690701009546, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: sphereOffset.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5831827090361496139, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3} propertyPath: m_Enabled diff --git a/Assets/Scripts/Camera/HideWall.cs b/Assets/Scripts/Camera/HideWall.cs index 9b3f3b5..41a2e97 100644 --- a/Assets/Scripts/Camera/HideWall.cs +++ b/Assets/Scripts/Camera/HideWall.cs @@ -12,7 +12,7 @@ public class HideWall : MonoBehaviour [Range(1f, 10f)] public float showFadeSpeed; public float sphereRadius; - [Range(0, 10)] public float sphereRange; + [Range(0, 100)] public float sphereRange; public Vector3 sphereOffset; float maxSphereRayDistance; @@ -22,7 +22,7 @@ public class HideWall : MonoBehaviour { if (target == null && towerCamScript != null) { - target = towerCamScript.m_gameObject; + target = towerCamScript.newTarget; } maxSphereRayDistance = Vector3.Distance(origin.transform.position, target.transform.position) - (sphereRadius * 2) + sphereRange; diff --git a/Assets/Scripts/Camera/TowerCam.cs b/Assets/Scripts/Camera/TowerCam.cs index 9e3ed4a..b458403 100644 --- a/Assets/Scripts/Camera/TowerCam.cs +++ b/Assets/Scripts/Camera/TowerCam.cs @@ -3,7 +3,9 @@ using UnityEngine; public class TowerCam : MonoBehaviour { - public GameObject m_gameObject; + [SerializeField] private GameObject m_gameObject; + + public GameObject newTarget; private void Start() { @@ -15,13 +17,15 @@ public class TowerCam : MonoBehaviour { if (target != null) { + newTarget = target; + m_gameObject.GetComponent().m_LookAt = target.transform; m_gameObject.GetComponent().m_Follow = target.transform; m_gameObject.GetComponent().m_Priority = 11; - //m_gameObject.GetComponent().GetRig(0).LookAt = target.transform; - //m_gameObject.GetComponent().GetRig(1).LookAt = target.transform; - //m_gameObject.GetComponent().GetRig(2).LookAt = target.transform; + m_gameObject.GetComponent().GetRig(0).LookAt = target.transform; + m_gameObject.GetComponent().GetRig(1).LookAt = target.transform; + m_gameObject.GetComponent().GetRig(2).LookAt = target.transform; } else {