From 630f3398fa2dfb4921708c1b172a477d561e56f2 Mon Sep 17 00:00:00 2001 From: kimrdd Date: Sun, 21 Apr 2024 03:22:56 +0200 Subject: [PATCH] sync --- Assets/Prefabs/Camera/TowerCam.prefab | 154 ++++--- Assets/Scenes/GameScene.unity | 501 +++++++++++++++++++++- Assets/Scripts/Camera/CameraController.cs | 4 +- Assets/Scripts/Camera/HideWall.cs | 7 + Assets/Scripts/Camera/TowerCam.cs | 6 +- 5 files changed, 590 insertions(+), 82 deletions(-) diff --git a/Assets/Prefabs/Camera/TowerCam.prefab b/Assets/Prefabs/Camera/TowerCam.prefab index 3ff165e..b9882df 100644 --- a/Assets/Prefabs/Camera/TowerCam.prefab +++ b/Assets/Prefabs/Camera/TowerCam.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3935553693191687206} - component: {fileID: 3732065988533673491} - component: {fileID: 2139314887802289122} - - component: {fileID: 3078086233640988956} + - component: {fileID: 3080339522778764198} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -59,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} + m_FollowOffset: {x: 0, y: 4.5, z: -1.75} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -100,7 +100,7 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &3078086233640988956 +--- !u!114 &3080339522778764198 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -109,24 +109,9 @@ MonoBehaviour: m_GameObject: {fileID: 1257898757355507338} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &2261812770106084702 GameObject: m_ObjectHideFlags: 3 @@ -217,7 +202,7 @@ GameObject: - component: {fileID: 3027632321437918642} - component: {fileID: 4362122749243549594} - component: {fileID: 8016315811664278882} - - component: {fileID: 6889278937293188591} + - component: {fileID: 4301055406757644015} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -265,7 +250,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} + m_FollowOffset: {x: 0, y: 4.5, z: -1.75} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -306,7 +291,7 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &6889278937293188591 +--- !u!114 &4301055406757644015 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -315,24 +300,9 @@ MonoBehaviour: m_GameObject: {fileID: 4740903846569071278} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &6141502994562452495 GameObject: m_ObjectHideFlags: 3 @@ -423,7 +393,7 @@ GameObject: - component: {fileID: 8170234917192505078} - component: {fileID: 511076899392859752} - component: {fileID: 1492161936061921830} - - component: {fileID: 4059060178688909238} + - component: {fileID: 8827996852199296668} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -471,7 +441,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} + m_FollowOffset: {x: 0, y: 4.5, z: -1.75} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -512,7 +482,7 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &4059060178688909238 +--- !u!114 &8827996852199296668 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -521,24 +491,9 @@ MonoBehaviour: m_GameObject: {fileID: 6870596811972565747} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &7138673713016148905 GameObject: m_ObjectHideFlags: 3 @@ -629,6 +584,9 @@ GameObject: - component: {fileID: 1628714305827477991} - component: {fileID: 9015098249639605300} - component: {fileID: 6162594480593627889} + - component: {fileID: 5831827090361496139} + - component: {fileID: 1880671857495123661} + - component: {fileID: 3685285690701009546} m_Layer: 0 m_Name: TowerCam m_TagString: Untagged @@ -694,14 +652,14 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_YAxis: - Value: 0.5 + Value: 1 m_SpeedMode: 0 m_MaxSpeed: 2 m_AccelTime: 0.2 m_DecelTime: 0.1 m_InputAxisName: Mouse Y m_InputAxisValue: 0 - m_InvertInput: 0 + m_InvertInput: 1 m_MinValue: 0 m_MaxValue: 1 m_Wrap: 0 @@ -725,7 +683,7 @@ MonoBehaviour: m_DecelTime: 0.1 m_InputAxisName: Mouse X m_InputAxisValue: 0 - m_InvertInput: 1 + m_InvertInput: 0 m_MinValue: -180 m_MaxValue: 180 m_Wrap: 1 @@ -771,3 +729,79 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bb343e5418f1e1144aab7c51b7482da7, type: 3} m_Name: m_EditorClassIdentifier: + m_gameObject: {fileID: 0} +--- !u!114 &5831827090361496139 +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: cf9c49671cd01e143b3f6bb3ecf490d5, type: 3} + m_Name: + m_EditorClassIdentifier: + cam: {fileID: 7612880158138396871} + scrollSpeed: 2.5 + stopAfterTime: 5 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + sens: {x: 300, y: 3} +--- !u!114 &1880671857495123661 +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: 44d70cc20219cd84593f67d248eafe36, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Offset: {x: 0, y: 0, z: -0.1} + m_ApplyAfter: 1 + m_PreserveComposition: 0 +--- !u!114 &3685285690701009546 +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: 6162594480593627889} + hideFadeSpeed: 7 + showFadeSpeed: 2 + sphereRadius: 3.5 + sphereRange: 2.5 + sphereOffset: {x: 0, y: 8, z: 0} diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index a55ae87..84d897e 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -356,6 +356,47 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0c13e24f92c86f84a85c76e0bca22830, type: 3} +--- !u!21 &213120911 +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 &224165741 GameObject: m_ObjectHideFlags: 0 @@ -896,6 +937,47 @@ 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 &631366007 +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 &779612215 GameObject: m_ObjectHideFlags: 0 @@ -1014,6 +1096,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &909993411 +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!1 &922758185 GameObject: m_ObjectHideFlags: 0 @@ -1145,60 +1268,65 @@ PrefabInstance: propertyPath: m_Name value: Cinemachine objectReference: {fileID: 0} + - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.10023358 + value: 0.08534324 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.022605715 + value: 0.019247489 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9703356 + value: 0.9717585 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.21884015 + value: -0.219161 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.x - value: 10.297432 + value: 2.4309583 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y - value: 12.445195 + value: 12.445194 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.z - value: 18.85268 + value: 18.973312 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.09954502 + value: 0.08475693 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.02546724 + value: 0.021683902 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9636698 + value: 0.9650828 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.2465418 + value: -0.24690327 objectReference: {fileID: 0} - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1225,11 +1353,26 @@ PrefabInstance: propertyPath: maxSphereRayDistance value: 7 objectReference: {fileID: 0} + - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.9598308 + objectReference: {fileID: 0} - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y value: 7.6427956 objectReference: {fileID: 0} + - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.z + value: 10.336213 + objectReference: {fileID: 0} + - target: {fileID: 3837216061230793568, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: stopAfterTime + value: 7.5 + objectReference: {fileID: 0} - target: {fileID: 5664717836218291588, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_Orbits.Array.data[0].m_Height @@ -1245,50 +1388,65 @@ PrefabInstance: propertyPath: m_Orbits.Array.data[2].m_Height value: -10 objectReference: {fileID: 0} + - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.09954503 + value: 0.08475693 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.025467241 + value: 0.021683903 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9636698 + value: 0.9650828 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.24654177 + value: -0.24690327 + objectReference: {fileID: 0} + - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.098769374 + value: 0.08409653 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.028326679 + value: 0.024118563 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.956161 + value: 0.95756304 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.27422333 + value: -0.27462542 objectReference: {fileID: 0} - target: {fileID: 7757173428948913319, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1621,6 +1779,47 @@ Transform: m_PrefabInstance: {fileID: 1016399493} m_PrefabAsset: {fileID: 0} --- !u!21 &1164447743 +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 &1270081032 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1891,6 +2090,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1554436711} m_PrefabAsset: {fileID: 0} +--- !u!21 &1630739536 +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 &1671723125 Material: serializedVersion: 8 @@ -1932,6 +2172,47 @@ Material: - _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 &1765594345 +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!1 &1785574039 GameObject: m_ObjectHideFlags: 0 @@ -2056,6 +2337,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 203396308} m_PrefabAsset: {fileID: 0} +--- !u!21 &1838569748 +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!1 &1902554698 GameObject: m_ObjectHideFlags: 0 @@ -2174,6 +2496,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &2067473092 +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 @@ -2359,6 +2722,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: 2757975024506450034, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material @@ -2474,6 +2857,26 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 1362039392} + - 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 @@ -2484,11 +2887,71 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 1671723125} + - 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: 937715444} + - 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/Scripts/Camera/CameraController.cs b/Assets/Scripts/Camera/CameraController.cs index 67e610c..65df70b 100644 --- a/Assets/Scripts/Camera/CameraController.cs +++ b/Assets/Scripts/Camera/CameraController.cs @@ -6,11 +6,11 @@ public class CameraController : MonoBehaviour { [SerializeField] private GameObject cam; - public float scrollSpeed; + public float scrollSpeed = 2.5f; [Range(5f, 30f)] public float stopAfterTime; public AnimationCurve curve = new AnimationCurve(new Keyframe(0f, 0f, 1f, 1f), new Keyframe(1f, 1f, 1f, 1f)); - public Vector2 sens; + public Vector2 sens = new Vector2(300f, 3f); private Vector2 defaultMaxSpeed; private float timer; diff --git a/Assets/Scripts/Camera/HideWall.cs b/Assets/Scripts/Camera/HideWall.cs index b2a3e0c..9b3f3b5 100644 --- a/Assets/Scripts/Camera/HideWall.cs +++ b/Assets/Scripts/Camera/HideWall.cs @@ -6,6 +6,8 @@ public class HideWall : MonoBehaviour [SerializeField] private GameObject target; [SerializeField] private GameObject origin; + [SerializeField] private TowerCam towerCamScript; + [Range(1f, 10f)] public float hideFadeSpeed; [Range(1f, 10f)] public float showFadeSpeed; @@ -18,6 +20,11 @@ public class HideWall : MonoBehaviour void Update() { + if (target == null && towerCamScript != null) + { + target = towerCamScript.m_gameObject; + } + maxSphereRayDistance = Vector3.Distance(origin.transform.position, target.transform.position) - (sphereRadius * 2) + sphereRange; Vector3 direction = ((target.transform.position + sphereOffset) - origin.transform.position).normalized; diff --git a/Assets/Scripts/Camera/TowerCam.cs b/Assets/Scripts/Camera/TowerCam.cs index e79de07..307fe7e 100644 --- a/Assets/Scripts/Camera/TowerCam.cs +++ b/Assets/Scripts/Camera/TowerCam.cs @@ -3,7 +3,7 @@ using UnityEngine; public class TowerCam : MonoBehaviour { - private GameObject m_gameObject; + public GameObject m_gameObject; private void Start() { @@ -18,6 +18,10 @@ public class TowerCam : MonoBehaviour 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; } else {