From eadfddf220456fce4edbb65397a6d663146204d3 Mon Sep 17 00:00:00 2001 From: Mausham Date: Mon, 29 Dec 2025 17:47:01 -0800 Subject: [PATCH] added ads camera --- AGENTS.md | 2 +- .../Code/Presentation/Player/PlayerMotor.cs | 9 +- Assets/Scenes/GameScene.unity | 374 ++++++++++++++---- 3 files changed, 314 insertions(+), 71 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 86b982e..3b67fae 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -2,7 +2,7 @@ - Project name: MobileShooter - Unity version: Unity 6000.3.0f1 - Active game object: - - Name: Player + - Name: Third Person ADS Camera - Tag: Untagged - Layer: Default \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Presentation/Player/PlayerMotor.cs b/Assets/Darkmatter/Code/Presentation/Player/PlayerMotor.cs index d452f8a..6bcfeee 100644 --- a/Assets/Darkmatter/Code/Presentation/Player/PlayerMotor.cs +++ b/Assets/Darkmatter/Code/Presentation/Player/PlayerMotor.cs @@ -49,6 +49,7 @@ namespace Darkmatter.Presentation [Inject] private PlayerConfigSO playerConfig; + private void Start() { Cursor.lockState = CursorLockMode.Locked; @@ -58,7 +59,7 @@ namespace Darkmatter.Presentation } private void Update() { - //HandleAim(); + HandleAim(); HandleShooting(); } @@ -124,8 +125,8 @@ namespace Darkmatter.Presentation if(Physics.Raycast(ray,out RaycastHit hitPoint, 100f,groundLayer)) { mouseWorldPos= hitPoint.point; - aim.position = mouseWorldPos; - //aim.position = Vector3.Lerp(aim.position, hitPoint.point, Time.deltaTime * smoothing); + //aim.position = mouseWorldPos; + aim.position = Vector3.Lerp(aim.position, hitPoint.point, Time.deltaTime * smoothing); } Vector3 aimDir = (mouseWorldPos - transform.position).normalized; @@ -147,7 +148,7 @@ namespace Darkmatter.Presentation public void SetCameraRotation(float pitch, float yaw) { cinemachineFollowTarget.rotation = Quaternion.Euler(pitch, yaw, 0); - HandleAim(); + //transform.rotation = Quaternion.Slerp(transform.rotation, Quaternion.Euler(0,yaw,0), Time.deltaTime*turnSpeed); } diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 43fc902..2c5c7d0 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -14974,6 +14974,108 @@ Transform: - {fileID: 1587264609} m_Father: {fileID: 1232810808} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &300911079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 300911080} + - component: {fileID: 300911083} + - component: {fileID: 300911082} + - component: {fileID: 300911081} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &300911080 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300911079} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1188606427} + m_Father: {fileID: 505095049} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &300911081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300911079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &300911082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300911079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &300911083 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300911079} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &306589417 GameObject: m_ObjectHideFlags: 0 @@ -15097,7 +15199,7 @@ Transform: m_GameObject: {fileID: 330585543} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.8, y: 2.6, z: -4} + m_LocalPosition: {x: 0.8, y: 2.571, z: -4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -15211,6 +15313,7 @@ Transform: m_Children: - {fileID: 1363335724} - {fileID: 416421431} + - {fileID: 505095049} - {fileID: 330585546} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -29357,63 +29460,6 @@ ParticleSystemRenderer: m_MeshWeighting1: 1 m_MeshWeighting2: 1 m_MeshWeighting3: 1 ---- !u!1001 &387680191 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalPosition.x - value: 1.14296 - objectReference: {fileID: 0} - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalPosition.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalPosition.z - value: 0.58427 - objectReference: {fileID: 0} - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 543925742380460365, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8503761475068701983, guid: 66690771668559c4d94e4475af123c1e, type: 3} - propertyPath: m_Name - value: BulletRenderer - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 66690771668559c4d94e4475af123c1e, type: 3} --- !u!1 &389227800 GameObject: m_ObjectHideFlags: 0 @@ -29676,7 +29722,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!108 &410087040 Light: m_ObjectHideFlags: 0 @@ -29804,7 +29850,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &416421428 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29901,7 +29947,7 @@ Transform: m_GameObject: {fileID: 416421427} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.8, y: 2.6, z: -2} + m_LocalPosition: {x: 0.8, y: 2.571, z: -2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -30146,6 +30192,128 @@ Transform: - {fileID: 306589418} m_Father: {fileID: 543495399} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &505095048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 505095049} + - component: {fileID: 505095052} + - component: {fileID: 505095051} + - component: {fileID: 505095050} + m_Layer: 0 + m_Name: ZoomScopeADSCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &505095049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505095048} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.8, y: 2.571, z: -2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 300911080} + m_Father: {fileID: 335159078} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &505095050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505095048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2588cc5dedbb75e49a44aada63f7b939, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineThirdPersonAim + AimCollisionFilter: + serializedVersion: 2 + m_Bits: 1 + IgnoreTag: + AimDistance: 200 + NoiseCancellation: 1 +--- !u!114 &505095051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505095048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 625c14eee3ad46c99df7c7c891ef668a, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineThirdPersonFollow + Damping: {x: 0.1, y: 0.5, z: 0.3} + ShoulderOffset: {x: 0.8, y: -0.4, z: 0} + VerticalArmLength: 1.2 + CameraSide: 1 + CameraDistance: 2 + AvoidObstacles: + Enabled: 0 + CollisionFilter: + serializedVersion: 2 + m_Bits: 1 + IgnoreTag: + CameraRadius: 0.2 + DampingIntoCollision: 0 + DampingFromCollision: 0.5 +--- !u!114 &505095052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505095048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera + Priority: + Enabled: 0 + m_Value: 0 + OutputChannel: 1 + StandbyUpdate: 2 + m_StreamingVersion: 20241001 + m_LegacyPriority: 0 + Target: + TrackingTarget: {fileID: 5531060705487523142} + LookAtTarget: {fileID: 0} + CustomLookAtTarget: 0 + Lens: + FieldOfView: 15 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + PhysicalProperties: + GateFit: 2 + SensorSize: {x: 21.946, y: 16.002} + LensShift: {x: 0, y: 0} + FocusDistance: 10 + Iso: 200 + ShutterSpeed: 0.005 + Aperture: 16 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + BlendHint: 0 --- !u!1 &535268728 GameObject: m_ObjectHideFlags: 0 @@ -40924,6 +41092,81 @@ Transform: - {fileID: 454484357} m_Father: {fileID: 1533103411} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1188606426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1188606427} + - component: {fileID: 1188606429} + - component: {fileID: 1188606428} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1188606427 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1188606426} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 300911080} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1188606428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1188606426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b493e9a4650e7ec4cb70cf682d680f1e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1188606429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1188606426} + m_CullTransparentMesh: 1 --- !u!1 &1216835736 GameObject: m_ObjectHideFlags: 0 @@ -46162,7 +46405,7 @@ Transform: m_GameObject: {fileID: 1363335720} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.8, y: 2.6, z: -4} + m_LocalPosition: {x: 0.8, y: 2.571, z: -4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -58176,7 +58419,7 @@ Transform: m_GameObject: {fileID: 682798877665067124} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.029, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -58726,7 +58969,7 @@ MonoBehaviour: groundLayer: serializedVersion: 2 m_Bits: 8 - turnSpeed: 5 + turnSpeed: 4 smoothing: 10 animator: {fileID: 3649487752288184257} aim: {fileID: 1758691227} @@ -98289,7 +98532,7 @@ CharacterController: m_StepOffset: 0.3 m_SkinWidth: 0.08 m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 1.3, z: 0} + m_Center: {x: 0, y: 1.4, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -98301,7 +98544,6 @@ SceneRoots: - {fileID: 1758691227} - {fileID: 944634550} - {fileID: 857458502} - - {fileID: 387680191} - {fileID: 1576242273} - {fileID: 1761763681} - {fileID: 4813119173320015549}